diff --git a/hrp2-14-description/Makefile b/hrp2-14-description/Makefile index 701a6f2ea5ef7c16cb27428f2edcc551d9755446..1d077eb030bab0c1fc6714dd72e2479f1b32d6f2 100644 --- a/hrp2-14-description/Makefile +++ b/hrp2-14-description/Makefile @@ -2,9 +2,9 @@ # Created: Olivier Stasse on Wed, 17 Jun 2015 # VERSION= 1.0.2 -ROS_PKG= hrp2_14_description +ROS_PKG= hrp2-14-description ROS_VERSION= ${VERSION} -DISTNAME= hrp2_14_description-${VERSION} +DISTNAME= hrp2-14-description-${VERSION} CATEGORIES= robots MASTER_SITES= ${MASTER_SITE_JRL}ros/${ROS_PKG}/ MASTER_REPOSITORY= ${MASTER_REPOSITORY_JRL}robots/ros-hrp2/hrp2-14-description @@ -17,9 +17,9 @@ RESTRICTED= Redistribution of repackaged binaries not permitted NO_PUBLIC_SRC= ${RESTRICTED} NO_PUBLIC_BIN= ${RESTRICTED} -DYNAMIC_PLIST_DIRS+= share/doc/hrp2_14_description +DYNAMIC_PLIST_DIRS+= share/doc/hrp2-14-description -include ../robot_capsule_urdf/depend.mk +include ../../wip/robot-capsule-urdf/depend.mk include ../../graphics/urdfdom/depend.mk include ../../devel/ros-catkin/depend.mk include ../../devel/ros-xacro/depend.mk diff --git a/hrp2-14-description/depend.mk b/hrp2-14-description/depend.mk index bc2e18bfdf6e87d5dddbdd77c5f8ea1d86f99cd0..0da6a4d99a21c0f6c9353ecc7949895cd05a9d2f 100644 --- a/hrp2-14-description/depend.mk +++ b/hrp2-14-description/depend.mk @@ -9,7 +9,7 @@ ifeq (+,$(DEPEND_DEPTH)) DEPEND_PKG+= hrp2-14-description endif -ifeq (+,$(ROMEO_DEPEND_MK)) # ------------------------------------------- +ifeq (+,$(HRP2_14_DESCRIPTION_DEPEND_MK)) # ------------------------------------------- PREFER.hrp2-14-description?= robotpkg