]>
Commit | Line | Data |
---|---|---|
6efb548a JB |
1 | --- colord-1.4.1/data/meson.build.orig 2017-08-21 11:02:36.000000000 +0200 |
2 | +++ colord-1.4.1/data/meson.build 2017-12-23 22:57:10.663716927 +0100 | |
3 | @@ -14,7 +14,7 @@ | |
4 | ||
5 | if get_option('enable-bash-completion') | |
6 | install_data('colormgr', | |
7 | - install_dir: bash_completion.get_pkgconfig_variable('completionsdir') | |
8 | + install_dir: get_option('with-bash-completion-dir') | |
9 | ) | |
10 | endif | |
11 | ||
12 | --- colord-1.4.1/meson.build.orig 2017-08-21 11:02:36.000000000 +0200 | |
13 | +++ colord-1.4.1/meson.build 2017-12-23 23:41:23.647019972 +0100 | |
14 | @@ -146,9 +146,6 @@ | |
15 | gnome_desktop = dependency('gnome-desktop-3.0', version : '>= 0.2.7') | |
16 | colord_gtk = dependency('colord-gtk', version : '>= 0.1.24') | |
17 | endif | |
18 | -if get_option('enable-bash-completion') | |
19 | - bash_completion = dependency('bash-completion', version : '>= 2.0') | |
20 | -endif | |
21 | ||
22 | if get_option('enable-sane') | |
23 | sane = dependency('sane-backends') | |
24 | --- colord-1.4.1/meson_options.txt.orig 2017-08-21 11:02:36.000000000 +0200 | |
25 | +++ colord-1.4.1/meson_options.txt 2017-12-23 23:42:47.510352342 +0100 | |
26 | @@ -12,3 +12,5 @@ | |
27 | option('with-daemon-user', type : 'string', value : 'root', description : 'User for running the colord daemon') | |
28 | option('enable-man', type : 'boolean', value : true, description : 'Generate man pages') | |
29 | option('enable-docs', type : 'boolean', value : true, description : 'Generate documentation') | |
30 | +option('with-bash-completion-dir', type : 'string', description : 'Bash | |
31 | +completions dir') |