From fe175db8cc080508b0ca31f8c772d8bd9c1fdb52 Mon Sep 17 00:00:00 2001
From: Anthony Mallet <anthony.mallet@laas.fr>
Date: Tue, 31 May 2016 14:50:48 +0200
Subject: [PATCH] [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
---
hrp2-machine/Makefile | 4 +---
hrp2-machine/PLIST | 5 +++++
hrp2-machine/depend.mk | 5 ++---
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/hrp2-machine/Makefile b/hrp2-machine/Makefile
index 4eefc018..302de330 100644
--- a/hrp2-machine/Makefile
+++ b/hrp2-machine/Makefile
@@ -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
diff --git a/hrp2-machine/PLIST b/hrp2-machine/PLIST
index cf057a64..86633314 100644
--- a/hrp2-machine/PLIST
+++ b/hrp2-machine/PLIST
@@ -1,3 +1,8 @@
+@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
diff --git a/hrp2-machine/depend.mk b/hrp2-machine/depend.mk
index b0bf9020..4d014040 100644
--- a/hrp2-machine/depend.mk
+++ b/hrp2-machine/depend.mk
@@ -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:+=}
--
GitLab