From f6e3a9714e6267f20c225ed5fce118ab1db588cc Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 23 Aug 2019 11:11:01 +0200
Subject: [PATCH] [wip/ros-universal-robot] prefer robotpkg on 18.04
---
ros-universal-robot/depend.mk | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/ros-universal-robot/depend.mk b/ros-universal-robot/depend.mk
index b112caec..4eac820e 100644
--- a/ros-universal-robot/depend.mk
+++ b/ros-universal-robot/depend.mk
@@ -12,8 +12,13 @@ endif
ifeq (+,$(ROS_UNIVERSAL_ROBOT_DEPEND_MK)) # --------------------------------------
include ../../meta-pkgs/ros-base/depend.common
-PREFER.ros-universal-robot?= ${PREFER.ros-base}
-SYSTEM_PREFIX.ros-universal-robot?= ${SYSTEM_PREFIX.ros-base}
+include ../../mk/robotpkg.prefs.mk
+ifeq (18.04,${OS_VERSION})
+ PREFER.ros-universal-robot?= robotpkg
+else
+ PREFER.ros-universal-robot?= ${PREFER.ros-base}
+ SYSTEM_PREFIX.ros-universal-robot?= ${SYSTEM_PREFIX.ros-base}
+endif
DEPEND_USE+= ros-universal-robot
ROS_DEPEND_USE+= ros-universal-robot
--
GitLab