Fix cookie with ActivateItems

[icinga2] / config.h.cmake

diff --git a/config.h.cmake b/config.h.cmake
index e8a7bdcba0c5cdd8d6149413520a32fde31bb5c4..16fa190f17e7ccf3b97ccfc2443ed1ad6fb16a0b 100644 (file)
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -13,17 +13,24 @@
 
 #cmakedefine ICINGA2_UNITY_BUILD
 
-#define ICINGA_PREFIX "${CMAKE_INSTALL_PREFIX}"
-#define ICINGA_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}"
-#define ICINGA_RUNDIR "${ICINGA2_RUNDIR}"
-#define ICINGA_LOCALSTATEDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}"
-#define ICINGA_PKGDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/icinga2"
-#define ICINGA_INCLUDECONFDIR "${CMAKE_INSTALL_FULL_DATADIR}/icinga2/include"
+#define ICINGA_CONFIGDIR "${ICINGA2_FULL_CONFIGDIR}"
+#define ICINGA_DATADIR "${ICINGA2_FULL_DATADIR}"
+#define ICINGA_LOGDIR "${ICINGA2_FULL_LOGDIR}"
+#define ICINGA_CACHEDIR "${ICINGA2_FULL_CACHEDIR}"
+#define ICINGA_SPOOLDIR "${ICINGA2_FULL_SPOOLDIR}"
+#define ICINGA_INITRUNDIR "${ICINGA2_FULL_INITRUNDIR}"
+#define ICINGA_INCLUDECONFDIR "${ICINGA2_FULL_INCLUDEDIR}"
 #define ICINGA_USER "${ICINGA2_USER}"
 #define ICINGA_GROUP "${ICINGA2_GROUP}"
-
 #define ICINGA_BUILD_HOST_NAME "${ICINGA2_BUILD_HOST_NAME}"
 #define ICINGA_BUILD_COMPILER_NAME "${ICINGA2_BUILD_COMPILER_NAME}"
 #define ICINGA_BUILD_COMPILER_VERSION "${ICINGA2_BUILD_COMPILER_VERSION}"
 
+// Deprecated options?
+#define ICINGA_PKGDATADIR "${ICINGA2_FULL_PKGDATADIR}"
+#define ICINGA_PREFIX "${CMAKE_INSTALL_PREFIX}"
+#define ICINGA_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}"
+#define ICINGA_RUNDIR "${ICINGA2_FULL_RUNDIR}"
+#define ICINGA_LOCALSTATEDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}"
+
 #endif /* CONFIG_H */