[ros-catkin] 01/01: Use correct paths for pkgconfig

[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 74e0f89e32a117ca0e1f6b5b1892ed69a626caaf
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Thu Nov 19 17:32:31 2015 +0100

    Use correct paths for pkgconfig
---
 .../0006-use-GNUInstallDirs-when-installing-into-usr.patch        | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 cf309f3..82f1f24 100644
--- a/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch
+++ b/debian/patches/0006-use-GNUInstallDirs-when-installing-into-usr.patch
@@ -37,7 +37,7 @@ index 6910906..e9ffeab 100644
  # 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
+index 7d56edf..7f3266b 100644
 --- a/cmake/catkin_package.cmake
 +++ b/cmake/catkin_package.cmake
 @@ -313,12 +313,12 @@ function(_catkin_package)
@@ -45,13 +45,13 @@ index 7d56edf..5792626 100644
    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)
++    file(MAKE_DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_LIB_DESTINATION}/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)
++      ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_LIB_DESTINATION}/pkgconfig/${PROJECT_NAME}.pc)
    endif()
  
    # generate devel space cfg-extras for project
@@ -60,7 +60,7 @@ index 7d56edf..5792626 100644
        ${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
++      DESTINATION ${CATKIN_GLOBAL_LIB_DESTINATION}/pkgconfig
      )
    endif()
  

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