summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig) <jan.steffens@gmail.com>2018-09-08 12:09:30 +0200
committerThomas Haller <thaller@redhat.com>2018-09-12 12:04:30 +0200
commit5b042b16ca19931df887709570b13a4dada374ba (patch)
treee60fad249139e86a44ddbd0a04e32db193a5da14
parent1fad494c3464ded6c59cd321a2c6e5f88064e757 (diff)
downloadNetworkManager-5b042b16ca19931df887709570b13a4dada374ba.tar.gz
meson: Use libexecdir for dnssec-trigger-script fallback
Use an `if` to keep line length down.
-rw-r--r--meson.build6
1 files changed, 5 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 9374136f78..5ff8d9546c 100644
--- a/meson.build
+++ b/meson.build
@@ -660,7 +660,11 @@ config_h.set_quoted('DNSMASQ_PATH', find_program(get_option('dnsmasq')).path())
# dnssec-trigger-script path
dnssec_trigger_script = find_program(get_option('dnssec_trigger'), required: false)
-config_h.set_quoted('DNSSEC_TRIGGER_SCRIPT', (dnssec_trigger_script.found() ? dnssec_trigger_script.path() : '/usr/libexec/dnssec-trigger-script'))
+if dnssec_trigger_script.found()
+ config_h.set_quoted('DNSSEC_TRIGGER_SCRIPT', dnssec_trigger_script.path())
+else
+ config_h.set_quoted('DNSSEC_TRIGGER_SCRIPT', join_paths(nm_libexecdir, 'dnssec-trigger-script'))
+endif
# system CA certificates path
system_ca_path = get_option('system_ca_path')