From 480a6baa30c1b14fe6c54338d05f29dd6e6a53bc Mon Sep 17 00:00:00 2001 From: scarab Date: Sun, 17 Aug 2008 15:23:38 +0000 Subject: - dalsi upravy build.sh pridano INSTALL_DATADIR_PATH, ktere by melo vyresit vetsinu problemu git-svn-id: http://opensvn.csie.org/tuxanci_ng@216 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 7196bfd..eeafe07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,9 +52,10 @@ SET ( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} ) # this specify location of additional cmake sources SET ( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ) #various variables -SET ( CMAKE_INSTALL_ETCDIR /etc ) +SET ( CMAKE_INSTALL_ETCDIR ${CMAKE_CONF_PATH} ) SET ( CMAKE_INSTALL_BINDIR bin ) -SET ( CMAKE_INSTALL_LIBDIR lib ) +SET ( CMAKE_INSTALL_DATADIR ${CMAKE_DATA_PATH} ) +SET ( CMAKE_INSTALL_LIBDIR ${LIB_INSTALL_DIR} ) # uninstall CONFIGURE_FILE ( "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" @@ -169,8 +170,8 @@ ENDIF ( NOT NO_Audio ) ############################################################################### IF ( Bundle ) SET ( CMAKE_CONF_PATH "../etc") - SET ( CMAKE_DATA_PATH "../share/") - SET ( LIB_INSTALL_DIR "../lib/") + SET ( CMAKE_DATA_PATH "../share") + SET ( LIB_INSTALL_DIR "../lib") SET ( CMAKE_INSTALL_PREFIX "/") SET ( CMAKE_INSTALL_BINDIR bin ) SET ( CMAKE_INSTALL_LIBDIR lib ) -- cgit v1.2.3