Skip to content
Snippets Groups Projects
Commit 82a5e7ab authored by Anthony Mallet's avatar Anthony Mallet
Browse files

[wip/hrp2-14-description] Fix library installation dir

* Do not let cmake guess the system library name, robotpkg always installs
  to 'prefix/lib'.
* While here, cleanup unsused variable in depend.mk
parent fe175db8
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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:+=}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment