From 78b31087634b29f7970aefefef7b3276de30445f Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 16 May 2010 16:34:05 +0000 Subject: [PATCH] * All tools: - Change: In the CMakeLists.txt, in all the install commands remove all the leading "/" as they prevents the CMAKE_INSTALL_PREFIX to be took into account. It was nevertheless working because buildCoriolis.py was using DESTDIR which is prepended anyway. * ./goodies: - Change: In buildCoriolis.py, no longer uses the DESTDIR but instead CMAKE_INSTALL_PREFIX. --- knik/cmake_modules/CMakeLists.txt | 2 +- knik/src/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/knik/cmake_modules/CMakeLists.txt b/knik/cmake_modules/CMakeLists.txt index d9c27fbe..d1e189b6 100644 --- a/knik/cmake_modules/CMakeLists.txt +++ b/knik/cmake_modules/CMakeLists.txt @@ -1 +1 @@ -install ( FILES FindKNIK.cmake DESTINATION /share/cmake_modules ) +install ( FILES FindKNIK.cmake DESTINATION share/cmake_modules ) diff --git a/knik/src/CMakeLists.txt b/knik/src/CMakeLists.txt index 703bc941..476b30bb 100644 --- a/knik/src/CMakeLists.txt +++ b/knik/src/CMakeLists.txt @@ -53,10 +53,10 @@ add_library ( flute ${fluteCpps} ) target_link_libraries ( flute ${CORIOLIS_LIBRARIES} ${HURRICANE_LIBRARIES} ) - install ( TARGETS knik flute DESTINATION /lib) + install ( TARGETS knik flute DESTINATION lib) install ( FILES ${includes} ${mocIncludes} - ${fluteIncludes} DESTINATION /include/coriolis/knik ) + ${fluteIncludes} DESTINATION include/coriolis/knik ) install ( FILES flute-2.4/etc/POST9.dat - flute-2.4/etc/POWV9.dat DESTINATION /share/etc/flute-2.4 ) + flute-2.4/etc/POWV9.dat DESTINATION share/etc/flute-2.4 )