diff --git a/hrp2-14-description/Makefile b/hrp2-14-description/Makefile index 7feddf7f0c20eb604bdea48a4fe32f96d5c34bb3..f4be7e8d3509bc78c741ebffbf97bd1aa59dc2a5 100644 --- a/hrp2-14-description/Makefile +++ b/hrp2-14-description/Makefile @@ -17,6 +17,8 @@ RESTRICTED= Redistribution of repackaged binaries not permitted NO_PUBLIC_SRC= ${RESTRICTED} NO_PUBLIC_BIN= ${RESTRICTED} +CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib + WRKSRC= ${WRKDIR}/hrp2_14_description-${VERSION} DYNAMIC_PLIST_DIRS+= share/doc/hrp2_14_description diff --git a/hrp2-14-description/depend.mk b/hrp2-14-description/depend.mk index 4402cd54550b0a6ff8540ed0563883d683fa2630..528026679bc6aa7780b4e5edf0804ffe5e589dbe 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 (+,$(HRP2_14_DESCRIPTION_DEPEND_MK)) # ------------------------------------------- +ifeq (+,$(HRP2_14_DESCRIPTION_DEPEND_MK)) # -------------------------------- PREFER.hrp2-14-description?= robotpkg @@ -17,11 +17,10 @@ SYSTEM_SEARCH.hrp2-14-description=\ 'lib/pkgconfig/hrp2_14_description.pc:/Version/s/[^0-9.]//gp' DEPEND_USE+= hrp2-14-description -ROS_DEPEND_USER+= ros-hrp2-14-description DEPEND_ABI.hrp2-14-description?= hrp2-14-description>=1.0.0 DEPEND_DIR.hrp2-14-description?= ../../wip/hrp2-14-description -endif # HRP2_14_DESCRIPTION_DEPEND_MK ------------------------------------------------- +endif # HRP2_14_DESCRIPTION_DEPEND_MK -------------------------------------- DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}