diff --git a/ros-universal-robot/depend.mk b/ros-universal-robot/depend.mk index b112caec9d27474609190975e2bf93cf178c76ed..4eac820e90bc9ef1c53efb5f8641895764de1b1d 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