The following commit has been merged in the master branch: commit 67c1a0519b04ac81b4d7c341c6c80e88b91ef95c Author: Gert Wollny <gw.foss...@gmail.com> Date: Wed Nov 28 19:11:09 2012 +0100
move to multiarch diff --git a/debian/libvistaio-dev.install b/debian/libvistaio-dev.install index 5774e64..7df81cd 100644 --- a/debian/libvistaio-dev.install +++ b/debian/libvistaio-dev.install @@ -1,3 +1,3 @@ usr/include/* -usr/lib/lib*.so -usr/lib/pkgconfig/* +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* diff --git a/debian/libvistaio14.install b/debian/libvistaio14.install index d0dbfd1..3ddde58 100644 --- a/debian/libvistaio14.install +++ b/debian/libvistaio14.install @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* diff --git a/vistaio/CMakeLists.txt b/vistaio/CMakeLists.txt index 5013b6c..cbc9f95 100644 --- a/vistaio/CMakeLists.txt +++ b/vistaio/CMakeLists.txt @@ -68,10 +68,12 @@ ADD_SIMPLE_TEST(2dspline) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/vconfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/vconfig.h) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/vconfig.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${VISTAIO_NAME}/vistaio) -INSTALL(FILES ${VISTAIO_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${VISTAIO_NAME}/vistaio) +INCLUDE(GNUInstallDirs) + +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/vconfig.h DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${VISTAIO_NAME}/vistaio) +INSTALL(FILES ${VISTAIO_HEADERS} DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${VISTAIO_NAME}/vistaio) INSTALL(TARGETS vistaio - RUNTIME DESTINATION "bin" - LIBRARY DESTINATION "lib" - ARCHIVE DESTINATION "lib") + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- Packaging of vistaio in Debian _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit