]>
Commit | Line | Data |
---|---|---|
425d8043 JB |
1 | --- fwupd-1.2.10/meson_options.txt.orig 2019-09-13 06:06:30.006025055 +0200 |
2 | +++ fwupd-1.2.10/meson_options.txt 2019-09-13 15:48:25.670204020 +0200 | |
3 | @@ -30,3 +30,4 @@ | |
445379a6 JB |
4 | option('efi-ldsdir', type : 'string', description : 'path to the EFI lds directory') |
5 | option('efi-includedir', type : 'string', value : '/usr/include/efi', description : 'path to the EFI header directory') | |
425d8043 | 6 | option('efi_os_dir', type: 'string', description : 'the name of OS directory in ESP') |
445379a6 | 7 | +option('bash_completiondir', type : 'string', value : '') |
f247bad4 JB |
8 | --- fwupd-1.4.4/data/bash-completion/meson.build.orig 2020-07-06 21:50:32.951174519 +0200 |
9 | +++ fwupd-1.4.4/data/bash-completion/meson.build 2020-07-06 22:18:15.335501944 +0200 | |
445379a6 JB |
10 | @@ -1,8 +1,12 @@ |
11 | -if bashcomp.found() | |
f247bad4 | 12 | +completions_dir = get_option('bash_completiondir') |
445379a6 | 13 | + |
f247bad4 JB |
14 | +if completions_dir == '' and bashcomp.found() |
15 | completions_dir = bashcomp.get_pkgconfig_variable('completionsdir', | |
16 | define_variable: bashcomp.version().version_compare('>= 2.10') ? ['datadir', datadir] : ['prefix', prefix], | |
445379a6 JB |
17 | ) |
18 | +endif | |
19 | ||
f247bad4 | 20 | +if completions_dir != '' |
445379a6 | 21 | |
f247bad4 JB |
22 | if get_option('agent') |
23 | install_data(['fwupdagent'], |