[dconf/wip/jtojnar/bash-completion-prefix] build: Install bash-completion relative to datadir
- From: Jan Tojnar <jtojnar src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf/wip/jtojnar/bash-completion-prefix] build: Install bash-completion relative to datadir
- Date: Thu, 16 Apr 2020 09:23:01 +0000 (UTC)
commit b3c9423c6151f3c28e526083ea2f04987a780fdf
Author: Jan Tojnar <jtojnar gmail com>
Date: Thu Apr 16 11:21:06 2020 +0200
build: Install bash-completion relative to datadir
Now that bash-completion 2.10 has been released, we no longer need
to rely on distro patches for overriding prefix but can pass datadir.
meson.build | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 6620112..32ecd1d 100644
--- a/meson.build
+++ b/meson.build
@@ -50,8 +50,7 @@ dbus_session_service_dir = dependency('dbus-1').get_pkgconfig_variable('session_
enable_bash_completion = get_option('bash_completion')
if enable_bash_completion
- # FIXME: the `.pc` file is wrong because `completionsdir` should be relative to `datadir`, not `prefix`
- completions_dir = dependency('bash-completion').get_pkgconfig_variable('completionsdir', define_variable:
['prefix', dconf_prefix])
+ completions_dir = dependency('bash-completion').get_pkgconfig_variable('completionsdir', define_variable:
['datadir', dconf_datadir])
endif
configure_file(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]