From 5fa3081334291b2cad270141b8c4f463143319f7 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 23 Sep 2019 09:32:34 +0200
Subject: [PATCH] [wip/ros-baxter-common] not available from ROS on 18.04
---
ros-baxter-common/depend.mk | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/ros-baxter-common/depend.mk b/ros-baxter-common/depend.mk
index 9ce446dd..a82d1668 100644
--- a/ros-baxter-common/depend.mk
+++ b/ros-baxter-common/depend.mk
@@ -12,8 +12,13 @@ endif
ifeq (+,$(ROS_BAXTER_COMMON_DEPEND_MK)) # --------------------------------------
include ../../meta-pkgs/ros-base/depend.common
-PREFER.ros-baxter-common?= ${PREFER.ros-base}
-SYSTEM_PREFIX.ros-baxter-common?= ${SYSTEM_PREFIX.ros-base}
+include ../../mk/robotpkg.prefs.mk
+ifeq (18.04,${OS_VERSION})
+ PREFER.ros-baxter-common?= robotpkg
+else
+ PREFER.ros-baxter-common?= ${PREFER.ros-base}
+ SYSTEM_PREFIX.ros-baxter-common?= ${SYSTEM_PREFIX.ros-base}
+endif
DEPEND_USE+= ros-baxter-common
ROS_DEPEND_USE+= ros-baxter-common
--
GitLab