From a67d6ecf63397fbe321d90d5f2240f1ae1759bbb Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Sun, 16 May 2010 16:34:08 +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. --- katabatic/cmake_modules/CMakeLists.txt | 2 +- katabatic/doc/CMakeLists.txt | 4 ++-- katabatic/src/CMakeLists.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/katabatic/cmake_modules/CMakeLists.txt b/katabatic/cmake_modules/CMakeLists.txt index 774ac201..c8ad6407 100644 --- a/katabatic/cmake_modules/CMakeLists.txt +++ b/katabatic/cmake_modules/CMakeLists.txt @@ -1 +1 @@ -install ( FILES FindKATABATIC.cmake DESTINATION /share/cmake_modules ) +install ( FILES FindKATABATIC.cmake DESTINATION share/cmake_modules ) diff --git a/katabatic/doc/CMakeLists.txt b/katabatic/doc/CMakeLists.txt index 75bc8217..5bb863ab 100644 --- a/katabatic/doc/CMakeLists.txt +++ b/katabatic/doc/CMakeLists.txt @@ -1,6 +1,6 @@ - set ( htmlInstallDir /share/doc/en/html/katabatic ) - set ( latexInstallDir /share/doc/en/latex/katabatic ) + set ( htmlInstallDir share/doc/en/html/katabatic ) + set ( latexInstallDir share/doc/en/latex/katabatic ) add_custom_target ( doc ALL cd ${KATABATIC_SOURCE_DIR}/doc && ${DOXYGEN_EXECUTABLE} doxyfile ) diff --git a/katabatic/src/CMakeLists.txt b/katabatic/src/CMakeLists.txt index be833270..ca39324c 100644 --- a/katabatic/src/CMakeLists.txt +++ b/katabatic/src/CMakeLists.txt @@ -54,7 +54,7 @@ endif ( CHECK_DETERMINISM ) ${LEFDEF_LIBRARIES} ${OA_LIBRARIES} ) - install ( TARGETS katabatic DESTINATION /lib) + install ( TARGETS katabatic DESTINATION lib) install ( FILES ${includes} - ${mocIncludes} DESTINATION /include/coriolis/katabatic ) + ${mocIncludes} DESTINATION include/coriolis/katabatic )