From 2b17f246f0b618a2608c7a85f261831a056b4d4c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 28 Jan 2020 08:19:53 -0600 Subject: [PATCH] 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 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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()