Kouhei Sutou
null+****@clear*****
Mon May 20 00:40:43 JST 2013
Kouhei Sutou 2013-05-20 00:40:43 +0900 (Mon, 20 May 2013) New Revision: 08e3111e630afacbcdf794da0d28b04d499574be https://github.com/groonga/groonga/commit/08e3111e630afacbcdf794da0d28b04d499574be Message: cmake: remove needless "${CMAKE_INSTALL_PREFIX}" It disables relative path install. Modified files: CMakeLists.txt Modified: CMakeLists.txt (+10 -10) =================================================================== --- CMakeLists.txt 2013-05-19 23:01:13 +0900 (f408060) +++ CMakeLists.txt 2013-05-20 00:40:43 +0900 (ac7983b) @@ -38,13 +38,13 @@ include(CheckLibraryExists) include(FindPkgConfig) include(${CMAKE_CURRENT_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake) -set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin") -set(LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") -set(INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include") -set(GRN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/groonga") -set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share") +set(BIN_DIR "bin") +set(LIB_DIR "lib") +set(INCLUDE_DIR "include") +set(GRN_INCLUDE_DIR "include/groonga") +set(DATA_DIR "share") set(GRN_DATA_DIR "${DATA_DIR}/${GRN_PROJECT_NAME}") -set(CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/etc") +set(CONFIG_DIR "etc") set(GRN_CONFIG_DIR "${CONFIG_DIR}/${GRN_PROJECT_NAME}") set(GRN_LOG_PATH @@ -355,10 +355,10 @@ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) set(prefix "${CMAKE_INSTALL_PREFIX}") set(exec_prefix "${prefix}") -set(bindir "${BIN_DIR}") -set(libdir "${LIB_DIR}") -set(includedir "${INCLUDE_DIR}") -set(datarootdir "${DATA_DIR}") +set(bindir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}") +set(libdir "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}") +set(includedir "${CMAKE_INSTALL_PREFIX}/${INCLUDE_DIR}") +set(datarootdir "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}") set(datadir "${datarootdir}") set(expanded_pluginsdir "${GRN_PLUGINS_DIR}") set(GRN_EXPANDED_DEFAULT_DOCUMENT_ROOT "${GRN_DEFAULT_DOCUMENT_ROOT}") -------------- next part -------------- HTML����������������������������...Download