[Openvas-commits] r5978 - trunk/openvas-manager

[scm-commit@wald.intevation.org]

Author: felix
Date: 2009-11-26 13:21:11 +0100 (Thu, 26 Nov 2009)
New Revision: 5978

Modified:
   trunk/openvas-manager/CMakeLists.txt
   trunk/openvas-manager/ChangeLog
Log:
Fixing certain wrong installation locations that could be set through
cmake. This partly fixes bug #1206 (http://bugs.intevation.org/1206).

* CMakeLists.txt: Respect SYSCONF_INSTALL_DIR if set.


Modified: trunk/openvas-manager/CMakeLists.txt
===================================================================
--- trunk/openvas-manager/CMakeLists.txt	2009-11-26 12:16:21 UTC (rev 5977)
+++ trunk/openvas-manager/CMakeLists.txt	2009-11-26 12:21:11 UTC (rev 5978)
@@ -49,7 +49,7 @@
 SET(CPACK_TOPLEVEL_TAG "")
 SET(CPACK_PACKAGE_VERSION_MAJOR "0")
 SET(CPACK_PACKAGE_VERSION_MINOR "9")
-SET(CPACK_PACKAGE_VERSION_PATCH "5.SVN")
+SET(CPACK_PACKAGE_VERSION_PATCH "5.r5976f")
 SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 SET(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
@@ -74,6 +74,10 @@
 set (CMAKE_BUILD                Debug)
 #set (CMAKE_VERBOSE_MAKEFILE     ON)
 
+if (SYSCONF_INSTALL_DIR)
+  set (SYSCONFDIR "${SYSCONF_INSTALL_DIR}")
+endif (SYSCONF_INSTALL_DIR)
+
 if (NOT SYSCONFDIR)
   set (SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc")
 endif (NOT SYSCONFDIR)

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-11-26 12:16:21 UTC (rev 5977)
+++ trunk/openvas-manager/ChangeLog	2009-11-26 12:21:11 UTC (rev 5978)
@@ -1,3 +1,10 @@
+2009-11-27  Felix Wolfsteller <felix.wolfsteller at intevation.de>
+
+	Fixing certain wrong installation locations that could be set through
+	cmake. This partly fixes bug #1206 (http://bugs.intevation.org/1206).
+
+	* CMakeLists.txt: Respect SYSCONF_INSTALL_DIR if set.
+
 2009-11-26  Felix Wolfsteller <felix.wolfsteller at intevation.de>
 
 	* src/manage.c (make_report_uuid): Minor reformatting, and replace