diff options
| author | Will Dietz <w@wdtz.org> | 2020-01-28 08:19:53 -0600 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-01-28 16:10:27 +0100 |
| commit | 2b17f246f0b618a2608c7a85f261831a056b4d4c (patch) | |
| tree | f8aec56057509343c3fd06b300b8e9cde63ca7e3 | |
| parent | 89c8a470473498f080b6d0920ddbce0bc0cdc36f (diff) | |
| download | NetworkManager-2b17f246f0b618a2608c7a85f261831a056b4d4c.tar.gz | |
build/meson: fix missing slash when detecting resolvconf/netconfig binaries
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.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 0d7b29e2bf..0d8a15bd57 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() |