Author: mattm
Date: 2016-09-22 14:57:24 +0200 (Thu, 22 Sep 2016)
New Revision: 26262
Modified:
trunk/openvas-manager/CMakeLists.txt
trunk/openvas-manager/ChangeLog
Log:
* CMakeLists.txt: Allow OPENVAS_RUN_DIR to be passed in.
Modified: trunk/openvas-manager/CMakeLists.txt
===================================================================
--- trunk/openvas-manager/CMakeLists.txt 2016-09-22 12:56:01 UTC (rev
26261)
+++ trunk/openvas-manager/CMakeLists.txt 2016-09-22 12:57:24 UTC (rev
26262)
@@ -182,7 +182,6 @@
set (OPENVAS_DATA_DIR "${DATADIR}/openvas")
set (OPENVAS_STATE_DIR "${LOCALSTATEDIR}/lib/openvas")
set (OPENVAS_LOG_DIR "${LOCALSTATEDIR}/log/openvas")
-set (OPENVAS_RUN_DIR "${LOCALSTATEDIR}/run")
set (OPENVAS_SYSCONF_DIR "${SYSCONFDIR}/openvas")
set (OPENVAS_SCAP_RES_DIR "${OPENVAS_DATA_DIR}/scap")
set (OPENVAS_CERT_RES_DIR "${OPENVAS_DATA_DIR}/cert")
@@ -195,6 +194,10 @@
set (OPENVAS_CLIENT_KEY
"${OPENVAS_STATE_DIR}/private/CA/clientkey.pem")
set (OPENVAS_CA_CERTIFICATE "${OPENVAS_STATE_DIR}/CA/cacert.pem")
+if (NOT OPENVAS_RUN_DIR)
+ set (OPENVAS_RUN_DIR "${LOCALSTATEDIR}/run")
+endif (NOT OPENVAS_RUN_DIR)
+
if (NOT OPENVAS_NVT_DIR)
set (OPENVAS_NVT_DIR "${OPENVAS_STATE_DIR}/plugins/")
endif (NOT OPENVAS_NVT_DIR)
Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog 2016-09-22 12:56:01 UTC (rev 26261)
+++ trunk/openvas-manager/ChangeLog 2016-09-22 12:57:24 UTC (rev 26262)
@@ -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 Michael Wiegand <michael.wieg...@greenbone.net>
* src/report_formats/LaTeX/latex.xsl: Use T1 font encoding to ensure
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
