Merge pull request #546 from janowagner/no-root-nvt-sync

Expect NVT sync script in bin directory.
greenbone · May 13, 2019 · 1a19cf8 · 1a19cf8
2 parents fcb6b6f + 4257650
commit 1a19cf8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2018 Greenbone Networks GmbH
+# Copyright (C) 2009-2019 Greenbone Networks GmbH
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 #
@@ -237,9 +237,9 @@ if (GVM_NVT_DIR)
         add_definitions (-DGVM_NVT_DIR="${GVM_NVT_DIR}")
 endif (GVM_NVT_DIR)
 
-if (SBINDIR)
-  add_definitions (-DSBINDIR="${SBINDIR}")
-endif (SBINDIR)
+if (BINDIR)
+  add_definitions (-DBINDIR="${BINDIR}")
+endif (BINDIR)
 
 if (DEFINED GVM_SQLITE_SLEEP_MAX)
         add_definitions (-DGVM_SQLITE_SLEEP_MAX=${GVM_SQLITE_SLEEP_MAX})

diff --git a/src/gmp.c b/src/gmp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009-2018 Greenbone Networks GmbH
+/* Copyright (C) 2009-2019 Greenbone Networks GmbH
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
@@ -4828,7 +4828,7 @@ static GMarkupParser xml_parser;
 /**
  * @brief The nvt synchronization script for this daemon.
  */
-static const gchar *nvt_sync_script = SBINDIR "/greenbone-nvt-sync";
+static const gchar *nvt_sync_script = BINDIR "/greenbone-nvt-sync";
 
 
 /* Client state. */