From 0834589a5ffe0b14f9ed1f00d84ec9699fe584be Mon Sep 17 00:00:00 2001
From: Olivier Stasse <ostasse@laas.fr>
Date: Tue, 7 Jan 2020 13:41:59 +0100
Subject: [PATCH] [wip/tiago-simulation] Make sure that ubuntu-distro detection
is working properly. Bumps PKGREVISION to 2.
---
tiago-simulation/Makefile | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tiago-simulation/Makefile b/tiago-simulation/Makefile
index b6722c94..0354cc78 100644
--- a/tiago-simulation/Makefile
+++ b/tiago-simulation/Makefile
@@ -10,7 +10,7 @@ PKGNAME= ${PKGBASE}-${VERSION}
ROSNAME= $(subst -,_,${PKGBASE})
WRKSRC= ${WRKDIR}/${ROSNAME}-${VERSION}
DIST_SUBDIR= ${PKGBASE}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= wip
HOMEPAGE= ${MASTER_SITE_GITHUB:=${ORG}/${ROSNAME}}
@@ -23,8 +23,6 @@ LICENSE= 2-clause-bsd
ROS_METAPKG= yes
USE_BOOST_LIBS= thread
-include ../../wip/sysdep/ubuntu-distro.mk
-
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
include ../../devel/ros-catkin/depend.mk
@@ -34,12 +32,15 @@ include ../../lang/ros-message-generation/depend.mk
include ../../lang/ros-message-runtime/depend.mk
include ../../middleware/ros-comm/depend.mk
include ../../wip/tiago-robot/depend.mk
+include ../../wip/sysdep/ubuntu-distro.mk
+$(info $(UBUNTUDISTRO))
+
ifeq (bionic,${UBUNTUDISTRO})
include ../../wip/pal-gazebo-plugins-melodic/depend.mk
include ../../wip/pal-hardware-gazebo-melodic/depend.mk
else
- include ../../wip/pal-gazebo-plugins/depend.mk
include ../../wip/pal-hardware-gazebo/depend.mk
+ include ../../wip/pal-gazebo-plugins/depend.mk
endif
include ../../wip/pal-gazebo-worlds/depend.mk
include ../../wip/prf-ros-controllers/depend.mk
--
GitLab