diff options
| author | Tomas 'ZeXx86' Jedrzejek <zexx86@gmail.com> | 2009-12-10 17:59:50 +0100 |
|---|---|---|
| committer | Tomas 'ZeXx86' Jedrzejek <zexx86@gmail.com> | 2009-12-10 17:59:50 +0100 |
| commit | 0fe406f08e5c9723fa05560504b99d110f92f98a (patch) | |
| tree | 57a88eeb122cfe59c2f9d4618f0a4571cc1e98ec | |
| parent | 8d194590a16424244965f31c150e8ca8e97a5dec (diff) | |
| parent | fdecf7478358e13974c025d2a1736cde6d5ad079 (diff) | |
Merge branch 'master' of git://repo.or.cz/tuxanci
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/base/path.h.in | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d72189..73fad62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,8 +40,6 @@ ELSE ( WIN32 ) SET ( CMAKE_LOCALE_PATH "${CMAKE_INSTALL_PREFIX}/share/locale" CACHE PATH "Locale path prefix" ) ENDIF ( WIN32 ) SET ( CMAKE_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/" CACHE PATH "Data path prefix" ) -SET ( CMAKE_LIB_PATH "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/" CACHE PATH "Library path prefix" ) -SET ( LIB_INSTALL_DIR "${CMAKE_LIB_PATH}" ) ############################################################################### # BASIC PROJECT VALUES ############################################################################### @@ -77,14 +75,13 @@ IF ( WIN32 ) SET ( CMAKE_INSTALL_DOCDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_DOC_PATH} ) ELSE ( WIN32 ) SET ( CMAKE_DOC_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/${APPNAME}" CACHE PATH "Doc path prefix" ) - SET ( CMAKE_INSTALL_LIBDIR ${CMAKE_LOCALE_PATH} ) + SET ( CMAKE_INSTALL_LOCALEDIR ${CMAKE_LOCALE_PATH} ) SET ( CMAKE_INSTALL_DOCDIR ${CMAKE_DOC_PATH} ) ENDIF ( WIN32 ) SET ( CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Binary path prefix" ) SET ( CMAKE_INSTALL_ICONDIR "${CMAKE_INSTALL_PREFIX}/share/pixmaps" CACHE PATH "Icon path prefix" ) SET ( CMAKE_INSTALL_DESKTOPDIR "share/applications" CACHE PATH "Desktop file path prefix") SET ( CMAKE_INSTALL_DATADIR ${CMAKE_DATA_PATH} ) -SET ( CMAKE_INSTALL_LIBDIR ${LIB_INSTALL_DIR} ) # defines to determine if we build package or not IF ( PACKAGE ) ADD_DEFINITIONS ( -DBUILD_PACKAGE ) diff --git a/src/base/path.h.in b/src/base/path.h.in index b0c383b..f14c343 100644 --- a/src/base/path.h.in +++ b/src/base/path.h.in @@ -6,10 +6,8 @@ #cmakedefine USE_MAGICK #define APPNAME "@APPNAME@" #ifdef __WIN32___ - #define PATH_MODULES "mods" PATH_SEPARATOR #define PATH_DIR "data" PATH_SEPARATOR #else - #define PATH_MODULES "@LIB_INSTALL_DIR@" PATH_SEPARATOR APPNAME PATH_SEPARATOR #define PATH_DIR "@CMAKE_DATA_PATH@" PATH_SEPARATOR APPNAME PATH_SEPARATOR #endif #define TUXANCI_VERSION "@TUXANCI_VERSION@" |