diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2021-01-11 18:41:28 +0000 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2021-01-19 14:15:45 +0000 |
| commit | 15ca240ce5c273156cc2a1c59cab42e954efe47a (patch) | |
| tree | 0f1b41b5dd8725396d7482145b9e58caf5e0bcd1 | |
| parent | be8eaddd46f09bb4bc114ab3114f926da51bcfec (diff) | |
| download | waffle-15ca240ce5c273156cc2a1c59cab42e954efe47a.tar.gz | |
meson: do not replace datadir for bash completion
With earlier commit we changed from redefine/replace datadir with ours.
Although that resulted in the completion being installed to the wrong
place /usr/usr/share/bash-completion/completions/
A proper solution is to not redefine/replace the variable at all. Since
doing so will result in the file(s) being installed where bash cannot
find them.
Fixes: acf1333 ("Initial meson build system")
Closes: https://gitlab.freedesktop.org/mesa/waffle/-/issues/59
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
| -rw-r--r-- | meson.build | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 0f72aba..0de90bc 100644 --- a/meson.build +++ b/meson.build @@ -110,9 +110,7 @@ dep_bash = dependency('bash-completion', required : false) if dep_bash.found() install_data( 'shell-completion/bash/wflinfo', - install_dir : dep_bash.get_pkgconfig_variable( - 'completionsdir', - define_variable : ['datadir', get_option('datadir')]), + install_dir : dep_bash.get_pkgconfig_variable('completionsdir'), ) endif |