Author: mattm
Date: 2016-09-22 14:56:01 +0200 (Thu, 22 Sep 2016)
New Revision: 26261

Modified:
   trunk/gsa/CMakeLists.txt
   trunk/gsa/ChangeLog
Log:
        * CMakeLists.txt: Allow OPENVAS_RUN_DIR to be passed in.

Modified: trunk/gsa/CMakeLists.txt
===================================================================
--- trunk/gsa/CMakeLists.txt    2016-09-22 10:56:49 UTC (rev 26260)
+++ trunk/gsa/CMakeLists.txt    2016-09-22 12:56:01 UTC (rev 26261)
@@ -227,7 +227,6 @@
 
 set (OPENVAS_STATE_DIR "${LOCALSTATEDIR}/lib/openvas")
 set (OPENVAS_LOG_DIR   "${LOCALSTATEDIR}/log/openvas")
-set (OPENVAS_RUN_DIR   "${LOCALSTATEDIR}/run")
 set (GSA_DATA_DIR "${DATADIR}/openvas/gsa")
 set (GSA_LOCALE_DIR "${DATADIR}/locale")
 
@@ -240,6 +239,10 @@
 set (GSA_CONFIG_DIR         "${SYSCONFDIR}/openvas/")
 set (GSA_CONFIG_FILE        "${SYSCONFDIR}/openvas/gsa.conf")
 
+if (NOT OPENVAS_RUN_DIR)
+  set (OPENVAS_RUN_DIR      "${LOCALSTATEDIR}/run")
+endif (NOT OPENVAS_RUN_DIR)
+
 message ("-- Install prefix: ${CMAKE_INSTALL_PREFIX}")
 
 ## Files generated on installation

Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog 2016-09-22 10:56:49 UTC (rev 26260)
+++ trunk/gsa/ChangeLog 2016-09-22 12:56:01 UTC (rev 26261)
@@ -1,3 +1,7 @@
+2016-09-22  Matthew Mundell <matthew.mund...@greenbone.net>
+
+       * CMakeLists.txt: Allow OPENVAS_RUN_DIR to be passed in.
+
 2016-09-22  Timo Pollmeier <timo.pollme...@greenbone.net>
 
        * src/html/classic/graphics.xsl (js-scan-management-top-visualization)

_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits

Reply via email to