[ros-catkin] 01/01: Add patch to install into multiarch dirs

[Jochen Sprickerhof]

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

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

commit 6c00707d4ad8ae7bb24ad2fe7a07f57b90dadb2f
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu Nov 19 17:28:13 2015 +0100

    Add patch to install into multiarch dirs
---
 ...e-GNUInstallDirs-when-installing-into-usr.patch | 66 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 67 insertions(+)

diff --git a/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch b/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch
new file mode 100644
index 0000000..cf309f3
--- /dev/null
+++ b/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch
@@ -0,0 +1,66 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Thu, 19 Nov 2015 17:27:23 +0100
+Subject: use GNUInstallDirs when installing into /usr
+
+---
+ cmake/all.cmake            | 11 +++++++++++
+ cmake/catkin_package.cmake |  6 +++---
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/all.cmake b/cmake/all.cmake
+index 6910906..e9ffeab 100644
+--- a/cmake/all.cmake
++++ b/cmake/all.cmake
+@@ -154,6 +154,16 @@ message(STATUS "catkin ${catkin_VERSION}")
+ unset(_CATKIN_CURRENT_PACKAGE)
+ 
+ # set global install destinations
++if(CMAKE_INSTALL_PREFIX STREQUAL "/usr")
++include(GNUInstallDirs)
++set(CATKIN_GLOBAL_BIN_DESTINATION "${CMAKE_INSTALL_BINDIR}")
++set(CATKIN_GLOBAL_ETC_DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}")
++set(CATKIN_GLOBAL_INCLUDE_DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
++set(CATKIN_GLOBAL_LIB_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++set(CATKIN_GLOBAL_LIBEXEC_DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}")
++set(CATKIN_GLOBAL_PYTHON_DESTINATION ${PYTHON_INSTALL_DIR})
++set(CATKIN_GLOBAL_SHARE_DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}")
++else()
+ set(CATKIN_GLOBAL_BIN_DESTINATION bin)
+ set(CATKIN_GLOBAL_ETC_DESTINATION etc)
+ set(CATKIN_GLOBAL_INCLUDE_DESTINATION include)
+@@ -161,6 +171,7 @@ set(CATKIN_GLOBAL_LIB_DESTINATION lib)
+ set(CATKIN_GLOBAL_LIBEXEC_DESTINATION lib)
+ set(CATKIN_GLOBAL_PYTHON_DESTINATION ${PYTHON_INSTALL_DIR})
+ set(CATKIN_GLOBAL_SHARE_DESTINATION share)
++endif()
+ 
+ # undefine CATKIN_ENV since it might be set in the cache from a previous build
+ set(CATKIN_ENV "" CACHE INTERNAL "catkin environment" FORCE)
+diff --git a/cmake/catkin_package.cmake b/cmake/catkin_package.cmake
+index 7d56edf..5792626 100644
+--- a/cmake/catkin_package.cmake
++++ b/cmake/catkin_package.cmake
+@@ -313,12 +313,12 @@ function(_catkin_package)
+ 
+   if(NOT PROJECT_SKIP_PKG_CONFIG_GENERATION)
+     # ensure that output folder exists
+-    file(MAKE_DIRECTORY ${CATKIN_DEVEL_PREFIX}/lib/pkgconfig)
++    file(MAKE_DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+     # generate devel space pc for project
+     em_expand(${catkin_EXTRAS_DIR}/templates/pkg.context.pc.in
+       ${CMAKE_CURRENT_BINARY_DIR}/catkin_generated/pkg.develspace.context.pc.py
+       ${catkin_EXTRAS_DIR}/em/pkg.pc.em
+-      ${CATKIN_DEVEL_PREFIX}/lib/pkgconfig/${PROJECT_NAME}.pc)
++      ${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/pkgconfig/${PROJECT_NAME}.pc)
+   endif()
+ 
+   # generate devel space cfg-extras for project
+@@ -439,7 +439,7 @@ function(_catkin_package)
+       ${catkin_EXTRAS_DIR}/em/pkg.pc.em
+       ${CMAKE_CURRENT_BINARY_DIR}/catkin_generated/installspace/${PROJECT_NAME}.pc)
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/catkin_generated/installspace/${PROJECT_NAME}.pc
+-      DESTINATION lib/pkgconfig
++      DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+     )
+   endif()
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 836abda..94572e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Don-t-add-default-paths-to-pkg-config-file.patch
 0005-Fix-location-of-etc-for-catkin_find.patch
 0005-Use-profile.d-in-usr-in-_setup_util.py.patch
+0006-use-GNUInstallDirs-when-installing-into-usr.patch

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