diff --git a/debian/patches/0001-Add-Debian-specific-SOVERSION.patch b/debian/patches/0001-Add-Debian-specific-SOVERSION.patch index ba7d908..9b2b929 100644 --- a/debian/patches/0001-Add-Debian-specific-SOVERSION.patch +++ b/debian/patches/0001-Add-Debian-specific-SOVERSION.patch @@ -7,7 +7,7 @@ 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7572c65..de414dc 100644 +index 7572c65..6f3d12a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,7 @@ catkin_package( diff --git a/debian/patches/0002-Use-catkin-variables-for-install-dirs.patch b/debian/patches/0002-Use-catkin-variables-for-install-dirs.patch new file mode 100644 index 0000000..0e32efe --- /dev/null +++ b/debian/patches/0002-Use-catkin-variables-for-install-dirs.patch @@ -0,0 +1,29 @@ +From: Jochen Sprickerhof +Date: Mon, 23 Nov 2015 14:35:05 +0100 +Subject: Use catkin variables for install dirs + +--- + CMakeLists.txt | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6f3d12a..5add1dc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,12 +21,10 @@ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${rosconsole_bridge_VER + + 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 +- FILES_MATCHING PATTERN "*.h" +-) ++ DIRECTORY include/${PROJECT_NAME}/ ++ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}) diff --git a/debian/patches/series b/debian/patches/series index 6eac731..7263444 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Add-Debian-specific-SOVERSION.patch +0002-Use-catkin-variables-for-install-dirs.patch