From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 7 Feb 2019 11:55:56 +0000 (+0100)
Subject: meson: use sbin_dir variable
X-Git-Tag: v4.0.0~24^2~172
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66352eab15d688d6086016b47174aac4bec8cc02;p=thirdparty%2Fknot-resolver.git

meson: use sbin_dir variable
---

diff --git a/daemon/meson.build b/daemon/meson.build
index 5d1939f21..134a4bc14 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -81,7 +81,4 @@ if get_option('daemon')
     install: true,
     install_dir: get_option('sbindir'),
   )
-
-  kresd_install_path = join_paths(  # path used in tests
-    prefix, get_option('sbindir'))
 endif
diff --git a/meson.build b/meson.build
index f072e0d30..59cfb23a1 100644
--- a/meson.build
+++ b/meson.build
@@ -40,6 +40,7 @@ endif
 data_dir = join_paths(prefix, get_option('datadir'), 'knot-resolver')
 doc_dir = join_paths(prefix, get_option('datadir'), 'doc', 'knot-resolver')
 etc_dir = join_paths(prefix, get_option('sysconfdir'), 'knot-resolver')
+sbin_dir = join_paths(prefix, get_option('sbindir'))
 
 config = configuration_data()
 config.set('keyfile_default', get_option('keyfile_default'))
diff --git a/tests/config/meson.build b/tests/config/meson.build
index 816c014dd..dcba74662 100644
--- a/tests/config/meson.build
+++ b/tests/config/meson.build
@@ -27,7 +27,7 @@ run_configtest = find_program('../../scripts/test-config.sh')
 
 # environment variables for test
 conftest_env = environment()
-conftest_env.prepend('PATH', kresd_install_path)
+conftest_env.prepend('PATH', sbin_dir)
 conftest_env.set('KRESD_NO_LISTEN', '1')
 conftest_env.set('SOURCE_PATH', meson.current_source_dir())
 
diff --git a/tests/integration/meson.build b/tests/integration/meson.build
index 0716bf922..13cf02687 100644
--- a/tests/integration/meson.build
+++ b/tests/integration/meson.build
@@ -30,7 +30,7 @@ deckard_contrib = custom_target(
 )
 
 deckard_env = environment()
-deckard_env.prepend('PATH', kresd_install_path)
+deckard_env.prepend('PATH', sbin_dir)
 
 deckard_kresd_run = find_program('deckard/kresd_run.sh')
 test(
diff --git a/tests/pytests/meson.build b/tests/pytests/meson.build
index 7b74cb93e..2e228609e 100644
--- a/tests/pytests/meson.build
+++ b/tests/pytests/meson.build
@@ -27,7 +27,7 @@ py3_deps += [
 ]
 
 pytests_env = environment()
-pytests_env.prepend('PATH', kresd_install_path)
+pytests_env.prepend('PATH', sbin_dir)
 pytests_env.prepend('PATH', meson.current_build_dir())  # for tlsproxy
 
 test(