]>
Commit | Line | Data |
---|---|---|
aa278a7b JB |
1 | --- PackageKit-1.2.0/contrib/meson.build.orig 2020-05-04 14:21:36.504296500 +0200 |
2 | +++ PackageKit-1.2.0/contrib/meson.build 2020-05-08 18:20:26.298494310 +0200 | |
3 | @@ -11,10 +11,14 @@ | |
4 | endif | |
577193a4 | 5 | |
aa278a7b JB |
6 | if get_option('bash_completion') |
7 | - bash_completion_dep = dependency('bash-completion', version: '>=2.0') | |
8 | + if get_option('bash_completion_dir') != '' | |
9 | + bash_completion_dir = get_option('bash_completion_dir') | |
10 | + else | |
11 | + bash_completion_dir = dependency('bash-completion', version: '>=2.0').get_pkgconfig_variable('completionsdir', define_variable: ['prefix', get_option('prefix')]) | |
12 | + endif | |
13 | install_data( | |
14 | 'pkcon', | |
15 | - install_dir: bash_completion_dep.get_pkgconfig_variable('completionsdir', define_variable: ['prefix', get_option('prefix')]) | |
16 | + install_dir: bash_completion_dir | |
17 | ) | |
18 | endif | |
19 | ||
20 | --- PackageKit-1.2.0/meson_options.txt.orig 2020-05-04 14:21:36.535296400 +0200 | |
21 | +++ PackageKit-1.2.0/meson_options.txt 2020-05-08 18:20:49.711700803 +0200 | |
22 | @@ -8,6 +8,8 @@ | |
23 | option('man_pages', type : 'boolean', value : true, description : 'Generate man pages') | |
24 | option('gtk_doc', type : 'boolean', value : false, description : 'Generate API reference') | |
25 | option('bash_completion', type : 'boolean', value : true, description : 'Bash completion') | |
26 | +option('bash_completion_dir', type : 'string', value : '', description : 'Bash | |
27 | +completion path') | |
28 | option('bash_command_not_found', type : 'boolean', value : true, description : 'Build Bash command-not-found functionality') | |
29 | option('packagekit_user', type : 'string', value : 'root', description : 'User for running the PackageKit daemon') | |
30 | option('local_checkout', type : 'boolean', value : false, description : 'Allow running in local checkout') |