Blob Blame History Raw
diff -up ./cmake/catkin_project.cmake.libdir ./cmake/catkin_project.cmake
--- ./cmake/catkin_project.cmake.libdir	2013-06-03 21:41:27.813479765 -0400
+++ ./cmake/catkin_project.cmake	2013-06-03 21:41:41.883587780 -0400
@@ -120,7 +120,7 @@ function(catkin_project PACKAGE_NAME)
     ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PACKAGE_NAME}.pc)
 
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${PACKAGE_NAME}.pc
-    DESTINATION lib/pkgconfig
+    DESTINATION lib${LIB_SUFFIX}/pkgconfig
     )
 
   string(TOLOWER ${PROJECT_NAME} project_lower)
diff -up ./cmake/templates/setup.sh.installable.in.libdir ./cmake/templates/setup.sh.installable.in
--- ./cmake/templates/setup.sh.installable.in.libdir	2013-06-03 21:40:56.360236602 -0400
+++ ./cmake/templates/setup.sh.installable.in	2013-06-03 21:41:13.024930743 -0400
@@ -25,7 +25,7 @@ else
   export LD_LIBRARY_PATH
 fi
 
-PKG_CONFIG_PATH=@CMAKE_INSTALL_PREFIX@/lib/pkgconfig:$PKG_CONFIG_PATH
+PKG_CONFIG_PATH=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@/pkgconfig:$PKG_CONFIG_PATH
 export PKG_CONFIG_PATH
 
 if [ -z "$CATKIN_SHELL" ] ; then