summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-09-24 12:00:01 +0100
committerTom Hacohen <tom@stosb.com>2014-09-24 12:00:01 +0100
commitc46696f1139c13bcf4f1238fc02cead811f477eb (patch)
tree5ad6a18d7432c8b8ad8a79d922b9d9a2572c9a69
parent1c7f31bc0f9f3bc639b18ba4790ba469f9b87792 (diff)
Clean up setting of PACKAGE_*_DIR.
-rw-r--r--CMakeLists.txt13
-rw-r--r--cmakeconfig.h.in4
2 files changed, 8 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 587abfe..ba3ce72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,15 +33,10 @@ CHECK_C_SOURCE_COMPILES(
33 " HAVE___ATTRIBUTE__ 33 " HAVE___ATTRIBUTE__
34 ) 34 )
35 35
36ADD_DEFINITIONS(-DPACKAGE_BIN_DIR="${CMAKE_INSTALL_PREFIX}/bin" 36set(PACKAGE_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
37 -DPACKAGE_DATA_DIR="${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME}" 37set(PACKAGE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME}")
38 -DPACKAGE_LIB_DIR="${CMAKE_INSTALL_PREFIX}/lib") 38set(PACKAGE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
39 39set(PACKACE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale")
40set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale")
41
42ADD_DEFINITIONS(
43 -DLOCALE_DIR="${LOCALEDIR}"
44 )
45 40
46ADD_DEFINITIONS(-DHAVE_CONFIG_H) 41ADD_DEFINITIONS(-DHAVE_CONFIG_H)
47 42
diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index de38751..7ea0ff6 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -1,5 +1,9 @@
1#define PACKAGE "@PACKAGE@" 1#define PACKAGE "@PACKAGE@"
2#define PACKAGE_NAME PACKAGE 2#define PACKAGE_NAME PACKAGE
3#define PACKAGE_BIN_DIR "@PACKAGE_BIN_DIR@"
4#define PACKAGE_LIB_DIR "@PACKAGE_LIB_DIR@"
5#define PACKAGE_DATA_DIR "@PACKAGE_DATA_DIR@"
6#define PACKAGE_LOCALE_DIR "@PACKAGE_LOCALE_DIR@"
3#define VERSION "@PACKAGE_VERSION@" 7#define VERSION "@PACKAGE_VERSION@"
4#define VMAJ @VMAJ@ 8#define VMAJ @VMAJ@
5#define VMIN @VMIN@ 9#define VMIN @VMIN@