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

[wip/hrp2-machine] Fix library installation dir and PLIST

* Do not let cmake guess the system library name, robotpkg always installs to
  'prefix/lib'.
* Add missing entries in PLIST
* While here, cleanup unsused variables
parent 744cff5e
No related branches found
No related tags found
No related merge requests found
......@@ -2,8 +2,6 @@
# Created: Olivier Stasse on Wed, 17 Jun 2015
#
VERSION= 1.0.1
ROS_PKG= hrp2-machine
ROS_VERSION= ${VERSION}
DISTNAME= hrp2-machine-${VERSION}
CATEGORIES= robots
MASTER_SITES= ${MASTER_SITE_JRL}ros/${ROS_PKG}/
......@@ -19,9 +17,9 @@ RESTRICTED= Redistribution of repackaged binaries not permitted
NO_PUBLIC_SRC= ${RESTRICTED}
NO_PUBLIC_BIN= ${RESTRICTED}
CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
DYNAMIC_PLIST_DIRS+= share/doc/hrp2_machine
include ../../devel/ros-catkin/depend.mk
include ../../interfaces/ros-common-msgs/depend.mk
include ../../interfaces/ros-std-msgs/depend.mk
......
@comment Tue May 31 14:48:49 CEST 2016
include/hrp2/machine/config.h
include/hrp2/machine/config.hh
include/hrp2/machine/deprecated.hh
include/hrp2/machine/warning.hh
lib/pkgconfig/hrp2_machine.pc
share/hrp2_machine/hrp2_10.machine
share/hrp2_machine/hrp2_14.machine
......
......@@ -9,7 +9,7 @@ ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= hrp2-machine
endif
ifeq (+,$(HRP2_MACHINE_DEPEND_MK)) # -------------------------------------------
ifeq (+,$(HRP2_MACHINE_DEPEND_MK)) # ---------------------------------------
PREFER.hrp2-machine?= robotpkg
......@@ -17,11 +17,10 @@ SYSTEM_SEARCH.hrp2-machine=\
'lib/pkgconfig/hrp2_machine.pc:/Version/s/[^0-9.]//gp'
DEPEND_USE+= hrp2-machine
ROS_DEPEND_USER+= ros-hrp2-machine
DEPEND_ABI.hrp2-machine?= hrp2-machine>=1.0.0
DEPEND_DIR.hrp2-machine?= ../../wip/hrp2-machine
endif # HRP2_MACHINE_DEPEND_MK -------------------------------------------------
endif # HRP2_MACHINE_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