Skip to content
Snippets Groups Projects
Commit f6e3a971 authored by Guilhem Saurel's avatar Guilhem Saurel
Browse files

[wip/ros-universal-robot] prefer robotpkg on 18.04

parent e51deab1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ros-universal-robot/depend.mk
+ 7
− 2
View file @ f6e3a971
...@@ -12,8 +12,13 @@ endif ...@@ -12,8 +12,13 @@ endif
ifeq (+,$(ROS_UNIVERSAL_ROBOT_DEPEND_MK)) # -------------------------------------- ifeq (+,$(ROS_UNIVERSAL_ROBOT_DEPEND_MK)) # --------------------------------------
include ../../meta-pkgs/ros-base/depend.common include ../../meta-pkgs/ros-base/depend.common
PREFER.ros-universal-robot?= ${PREFER.ros-base} include ../../mk/robotpkg.prefs.mk
SYSTEM_PREFIX.ros-universal-robot?= ${SYSTEM_PREFIX.ros-base} 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 DEPEND_USE+= ros-universal-robot
ROS_DEPEND_USE+= ros-universal-robot ROS_DEPEND_USE+= ros-universal-robot
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment