[ros-geometric-shapes] 01/02: Add patch for lib install dir

Jochen Sprickerhof jspricke-guest at moszumanska.debian.org
Sun Nov 22 19:06:25 UTC 2015


This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to branch master
in repository ros-geometric-shapes.

commit b4c7422deb6eeb060e9f3f5e634859d220f98d36
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Nov 22 20:05:46 2015 +0100

    Add patch for lib install dir
---
 ...-catkin-variables-for-install-destination.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/0002-Use-catkin-variables-for-install-destination.patch b/debian/patches/0002-Use-catkin-variables-for-install-destination.patch
new file mode 100644
index 0000000..f16654c
--- /dev/null
+++ b/debian/patches/0002-Use-catkin-variables-for-install-destination.patch
@@ -0,0 +1,23 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Sun, 22 Nov 2015 20:01:26 +0100
+Subject: Use catkin variables for install destination
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index da0181f..5f5a5a5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -74,8 +74,8 @@ if(CATKIN_ENABLE_TESTING)
+ endif()
+ 
+ install(TARGETS ${PROJECT_NAME}
+-        ARCHIVE DESTINATION lib
+-        LIBRARY DESTINATION lib)
++        ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
++        LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
+ 
+ install(DIRECTORY include/
+         DESTINATION include
diff --git a/debian/patches/series b/debian/patches/series
index 6eac731..56e35b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Add-Debian-specific-SOVERSION.patch
+0002-Use-catkin-variables-for-install-destination.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-geometric-shapes.git



More information about the debian-science-commits mailing list