]>
Commit | Line | Data |
---|---|---|
517c8d5d JB |
1 | --- dconf-0.30.1/meson_options.txt.orig 2018-10-22 23:53:04.000000000 +0200 |
2 | +++ dconf-0.30.1/meson_options.txt 2018-10-30 20:32:08.195263612 +0100 | |
3 | @@ -1,3 +1,4 @@ | |
4 | option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files') | |
5 | +option('bash_completion_dir', type: 'string', value: '') | |
6 | option('man', type: 'boolean', value: true, description: 'generate man pages') | |
7 | option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') | |
b66952a3 JB |
8 | --- dconf-0.38.0/meson.build.orig 2020-09-13 10:26:21.295046156 +0200 |
9 | +++ dconf-0.38.0/meson.build 2020-09-13 10:29:23.197394039 +0200 | |
10 | @@ -50,12 +50,16 @@ | |
517c8d5d JB |
11 | |
12 | enable_bash_completion = get_option('bash_completion') | |
13 | if enable_bash_completion | |
14 | + if get_option('bash_completion_dir') != '' | |
15 | + completions_dir = get_option('bash_completion_dir') | |
16 | + else | |
b66952a3 JB |
17 | bash_completion_dep = dependency('bash-completion') |
18 | completions_dir = bash_completion_dep.get_pkgconfig_variable( | |
19 | 'completionsdir', | |
20 | # bash-completion 2.10 changed the substitutions | |
21 | define_variable: bash_completion_dep.version().version_compare('>= 2.10') ? ['datadir', dconf_datadir] : ['prefix', dconf_prefix], | |
22 | ) | |
517c8d5d JB |
23 | + endif |
24 | endif | |
25 | ||
26 | configure_file( |