diff options
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/base/path.h.in | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 16c6d84..b520939 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,9 +36,9 @@ IF ( PACKAGE ) ELSE ( PACKAGE ) SET ( CMAKE_INSTALL_PREFIX "/usr/local/" CACHE PATH "Install path prefix" ) ENDIF ( PACKAGE ) -SET ( CMAKE_LOCALE_PATH "share/locale" CACHE PATH "Locale path prefix" ) -SET ( CMAKE_DATA_PATH "share/" CACHE PATH "Data path prefix" ) -SET ( CMAKE_LIB_PATH "lib/" CACHE PATH "Library path prefix" ) +SET ( CMAKE_LOCALE_PATH "${CMAKE_INSTALL_PREFIX}/share/locale" CACHE PATH "Locale path prefix" ) +SET ( CMAKE_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/" CACHE PATH "Data path prefix" ) +SET ( CMAKE_LIB_PATH "${CMAKE_INSTALL_PREFIX}/lib/" CACHE PATH "Library path prefix" ) SET ( LIB_INSTALL_DIR "${CMAKE_LIB_PATH}" ) ############################################################################### # BASIC PROJECT VALUES @@ -71,9 +71,9 @@ ENDIF ( CROSSCOMPILE ) SET ( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" ) #various variables SET ( CMAKE_INSTALL_ETCDIR ${CMAKE_CONF_PATH} ) -SET ( CMAKE_DOC_PATH "share/doc/${APPNAME}" CACHE PATH "Doc path prefix" ) -SET ( CMAKE_INSTALL_BINDIR "bin" CACHE PATH "Binary path prefix" ) -SET ( CMAKE_INSTALL_ICONDIR "share/pixmaps" CACHE PATH "Icon path prefix" ) +SET ( CMAKE_DOC_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/${APPNAME}" CACHE PATH "Doc path prefix" ) +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_LOCALEDIR ${CMAKE_LOCALE_PATH} ) SET ( CMAKE_INSTALL_DATADIR ${CMAKE_DATA_PATH} ) diff --git a/src/base/path.h.in b/src/base/path.h.in index 69b7c55..edd38e2 100644 --- a/src/base/path.h.in +++ b/src/base/path.h.in @@ -13,23 +13,23 @@ #define PREFIX PACKAGE_PREFIX "@CMAKE_INSTALL_PREFIX@" "/" #define APPNAME "@APPNAME@" #ifdef PUBLIC_SERVER - #define SERVER_CONFIG PREFIX "@CMAKE_CONF_PATH@" "/" APPNAME "/server.conf" + #define SERVER_CONFIG PACKAGE_PREFIX "@CMAKE_CONF_PATH@" "/" APPNAME "/server.conf" #endif /* PUBLIC_SERVER */ -#define PATH_DIR PREFIX "@CMAKE_DATA_PATH@" "/" APPNAME "/" +#define PATH_DIR PACKAGE_PREFIX "@CMAKE_DATA_PATH@" "/" APPNAME "/" /* windows bug */ #ifndef __WIN32__ - #define PATH_MODULES PREFIX "@LIB_INSTALL_DIR@" "/" APPNAME "/" + #define PATH_MODULES PACKAGE_PREFIX "@LIB_INSTALL_DIR@" "/" APPNAME "/" #else /* __WIN32__ */ - #define PATH_MODULES PREFIX + #define PATH_MODULES "./" #endif /* __WIN32__ */ #define PATH_IMAGE PATH_DIR "images/" #define PATH_ARENA PATH_DIR "arena/" #define PATH_SOUND PATH_DIR "sound/" #define PATH_MUSIC PATH_DIR "music/" -#define PATH_LOCALE PREFIX "@CMAKE_LOCALE_PATH@" "/" -#define PATH_DOC PREFIX "@CMAKE_DOC_PATH@" "/" -#define PACKAGE "tuxanci" +#define PATH_LOCALE PACKAGE_PREFIX "@CMAKE_LOCALE_PATH@" "/" +#define PATH_DOC PACKAGE_PREFIX "@CMAKE_DOC_PATH@" "/" +#define PACKAGE APPNAME #endif /* PATH_H */ |