From ac83e18323eabdace43c5a088e28cf78c2cbf6a4 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Wed, 25 Jul 2018 18:51:58 -0400 Subject: [PATCH] meson: Install bash completion helper in prefix A regression was causing the helpers to be installed in /share which would lead to permission denied error or PolicyKit to promtp for permission. See: 054fa3aa2 meson: Use new define_variable: feature instead of run_command() --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 07d82ec3c3..7bc2c837ef 100644 --- a/meson.build +++ b/meson.build @@ -436,13 +436,13 @@ bash_completions_dir = '' bash_helpers_dir = '' if bashcomp_found - bash_completions_dir = bashcomp_dep.get_pkgconfig_variable('completionsdir', define_variable: ['prefix', '']) + bash_completions_dir = bashcomp_dep.get_pkgconfig_variable('completionsdir', define_variable: ['prefix', '.']) if bash_completions_dir == '' message('Found bash-completion but the .pc file did not set \'completionsdir\'.') bashcomp_found = false endif - bash_helpers_dir = bashcomp_dep.get_pkgconfig_variable('helpersdir', define_variable: ['prefix', '']) + bash_helpers_dir = bashcomp_dep.get_pkgconfig_variable('helpersdir', define_variable: ['prefix', '.']) if bash_helpers_dir == '' message('Found bash-completion, but the .pc file did not set \'helpersdir\'.') bashcomp_found = false