From 6e2f8199420d0f51bf5a02bb29f32a9d6016b1e6 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 25 Aug 2006 21:21:10 -0400 Subject: [PATCH] ENH: Changing default data and doc directories to share/cmake-V.v and doc/cmake-V.v instead of share/CMake and doc/CMake for consistency with many linux distribution conventions. --- CMakeLists.txt | 4 ++-- bootstrap | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fea619cb..6e0496c73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,9 +15,9 @@ SET(BUILD_SHARED_LIBS OFF) # install tree. SET(CMAKE_SKIP_RPATH ON CACHE INTERNAL "CMake does not need RPATHs.") -SET(CMAKE_DATA_DIR "/share/CMake" CACHE STRING +SET(CMAKE_DATA_DIR "/share/cmake-${CMake_VERSION}" CACHE STRING "Install location for data (relative to prefix).") -SET(CMAKE_DOC_DIR "/doc/CMake" CACHE STRING +SET(CMAKE_DOC_DIR "/doc/cmake-${CMake_VERSION}" CACHE STRING "Install location for documentation (relative to prefix).") SET(CMAKE_MAN_DIR "/man" CACHE STRING "Install location for man pages (relative to prefix).") diff --git a/bootstrap b/bootstrap index 197953bfa..223149bc5 100755 --- a/bootstrap +++ b/bootstrap @@ -17,14 +17,23 @@ # #========================================================================= +# Version number extraction function. +cmake_version_component() +{ + cat "${cmake_source_dir}/CMakeLists.txt" | sed -n " +/^SET(CMake_VERSION_${1}/ {s/SET(CMake_VERSION_${1} *\([0-9]*\))/\1/;p;} +" +} + # Detect system and directory information. cmake_system=`uname` cmake_source_dir=`echo $0 | sed -n '/\//{s/\/[^\/]*$//;p;}'` cmake_source_dir=`(cd "${cmake_source_dir}";pwd)` cmake_binary_dir=`pwd` cmake_bootstrap_dir="${cmake_binary_dir}/Bootstrap.cmk" -cmake_data_dir="/share/CMake" -cmake_doc_dir="/doc/CMake" +cmake_version="`cmake_version_component MAJOR`.`cmake_version_component MINOR`" +cmake_data_dir="/share/cmake-${cmake_version}" +cmake_doc_dir="/doc/cmake-${cmake_version}" cmake_man_dir="/man" cmake_init_file=""