diff options
| author | Daniel Playfair Cal <daniel.playfair.cal@gmail.com> | 2020-05-04 02:23:20 +0000 |
|---|---|---|
| committer | Daniel Playfair Cal <daniel.playfair.cal@gmail.com> | 2020-05-04 02:23:20 +0000 |
| commit | e484dc9774bf439798a87efaaca1e2f195e4b027 (patch) | |
| tree | b6cdb5fc81ec4ce7eb595fb2b4407ade4df042c3 | |
| parent | 417580550af147f99d1eedc13df977f3f870349d (diff) | |
| parent | ba4abea9605fde709fd700383791ca760b24f8b4 (diff) | |
| download | dconf-e484dc9774bf439798a87efaaca1e2f195e4b027.tar.gz | |
Merge branch 'wip/jtojnar/bash-completion-prefix' into 'master'
build: Install bash-completion relative to datadir
See merge request GNOME/dconf!58
| -rw-r--r-- | meson.build | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 6620112..b7114bf 100644 --- a/meson.build +++ b/meson.build @@ -50,8 +50,12 @@ 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]) + bash_completion_dep = dependency('bash-completion') + completions_dir = bash_completion_dep.get_pkgconfig_variable( + 'completionsdir', + # bash-completion 2.10 changed the substitutions + define_variable: bash_completion_dep.version().version_compare('>= 2.10') ? ['datadir', dconf_datadir] : ['prefix', dconf_prefix], + ) endif configure_file( |