From 1c0efbce02c1a4111d0469a894099062c47f0d59 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@gmail.com>
Date: Thu, 14 Mar 2019 10:55:17 +0100
Subject: [PATCH] [wip/ros-universal-robot] fix PKGNAME
---
ros-universal-robot/Makefile | 8 ++++----
ros-universal-robot/depend.mk | 14 +++++++-------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ros-universal-robot/Makefile b/ros-universal-robot/Makefile
index 4d98a804..e7b439f4 100644
--- a/ros-universal-robot/Makefile
+++ b/ros-universal-robot/Makefile
@@ -3,14 +3,14 @@
#
ROS_PKG= universal_robot
-ROS_METAPKG= yes
-ROS_VERSION= 1.2.1
+ROS_METAPKG= yes
+ROS_VERSION= 1.2.1
ROS_REPO= ros-industrial
-PKGNAME= $(subst _,-,${ROS_PKG})-${ROS_VERSION}
+PKGNAME= ros-$(subst _,-,${ROS_PKG})-${ROS_VERSION}
CATEGORIES= wip
-ROS_COMMENT= ROS-Industrial Universal Robot meta-package
+ROS_COMMENT= ROS-Industrial Universal Robot meta-package
include ../../meta-pkgs/ros-base/Makefile.common
diff --git a/ros-universal-robot/depend.mk b/ros-universal-robot/depend.mk
index f30b0557..0e35b029 100644
--- a/ros-universal-robot/depend.mk
+++ b/ros-universal-robot/depend.mk
@@ -3,20 +3,20 @@
#
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-UNIVERSAL_ROBOT_DEPEND_MK:= ${UNIVERSAL_ROBOT_DEPEND_MK}+
+ROS_UNIVERSAL_ROBOT_DEPEND_MK:= ${ROS_UNIVERSAL_ROBOT_DEPEND_MK}+
ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= ros-universal-robot
endif
-ifeq (+,$(UNIVERSAL_ROBOT_DEPEND_MK)) # --------------------------------------
+ifeq (+,$(ROS_UNIVERSAL_ROBOT_DEPEND_MK)) # --------------------------------------
include ../../meta-pkgs/ros-base/depend.common
-PREFER.ros-universal-robot?= ${PREFER.ros-base}
-SYSTEM_PREFIX.ros-class-loader?=${SYSTEM_PREFIX.ros-base}
+PREFER.ros-universal-robot?= ${PREFER.ros-base}
+SYSTEM_PREFIX.ros-universal-robot?= ${SYSTEM_PREFIX.ros-base}
-DEPEND_USE+= ros-universal-robot
-ROS_DEPEND_USE+= ros-universal-robot
+DEPEND_USE+= ros-universal-robot
+ROS_DEPEND_USE+= ros-universal-robot
DEPEND_ABI.ros-universal-robot?= ros-universal-robot>=1.2.1
DEPEND_DIR.ros-universal-robot?= ../../wip/ros-universal-robot
@@ -24,6 +24,6 @@ DEPEND_DIR.ros-universal-robot?= ../../wip/ros-universal-robot
SYSTEM_SEARCH.ros-universal-robot=\
'share/universal_robot/package.xml:<version>/s/[^0-9.]//gp'
-endif # UNIVERSAL_ROBOT_DEPEND_MK --------------------------------------------
+endif # ROS_UNIVERSAL_ROBOT_DEPEND_MK --------------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
--
GitLab