summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Dietz <w@wdtz.org>2020-01-28 08:19:53 -0600
committerThomas Haller <thaller@redhat.com>2020-01-28 16:10:27 +0100
commit2b17f246f0b618a2608c7a85f261831a056b4d4c (patch)
treef8aec56057509343c3fd06b300b8e9cde63ca7e3
parent89c8a470473498f080b6d0920ddbce0bc0cdc36f (diff)
build/meson: fix missing slash when detecting resolvconf/netconfig binariesHEADmaster
Fix detection for /usr/local/sbin/{resolvconf,netconfig}. (and no longer automatically use "/usr/local/sbinnetconfig" if present) Fixes: 5a0cef2f3632 ('build: meson: uniform handling of rc managers') [thaller@redhat.com: commit message adjusted] https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/349
-rw-r--r--meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 0d7b29e2b..0d8a15bd5 100644
--- a/meson.build
+++ b/meson.build
@@ -621,7 +621,7 @@ foreach prog_name : ['resolvconf', 'netconfig']
prog = find_program(prog_name,
'/usr/' + prog_name,
'/usr/sbin/' + prog_name,
- '/usr/local/sbin' + prog_name,
+ '/usr/local/sbin/' + prog_name,
required : false)
if prog.found()
prog_path = prog.path()