[ros-catkin] 01/01: Update multi arch patch

[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 c048af397f4badf6268f1034f9bd827c70da060a
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Nov 20 07:41:09 2015 +0100

    Update multi arch patch
---
 .../0006-use-GNUInstallDirs-when-installing-into-usr.patch | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch b/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch
index 82f1f24..b715bcd 100644
--- a/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch
+++ b/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch
@@ -2,33 +2,35 @@ From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
 Date: Thu, 19 Nov 2015 17:27:23 +0100
 Subject: use GNUInstallDirs when installing into /usr
 
+use libdir for libexec as per policy
 ---
- cmake/all.cmake            | 11 +++++++++++
+ cmake/all.cmake            | 12 ++++++++++++
  cmake/catkin_package.cmake |  6 +++---
- 2 files changed, 14 insertions(+), 3 deletions(-)
+ 2 files changed, 15 insertions(+), 3 deletions(-)
 
 diff --git a/cmake/all.cmake b/cmake/all.cmake
-index 6910906..e9ffeab 100644
+index 6910906..8b0ca46 100644
 --- a/cmake/all.cmake
 +++ b/cmake/all.cmake
-@@ -154,6 +154,16 @@ message(STATUS "catkin ${catkin_VERSION}")
+@@ -154,6 +154,17 @@ message(STATUS "catkin ${catkin_VERSION}")
  unset(_CATKIN_CURRENT_PACKAGE)
  
  # set global install destinations
++# use multiarch when building with debhelper
 +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_LIBEXEC_DESTINATION "${CMAKE_INSTALL_LIBDIR}")
 +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)
+@@ -161,6 +172,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)

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