Skip to content
Snippets Groups Projects
Commit 3e11554a authored by Simon McVittie's avatar Simon McVittie
Browse files

completions: Don't try to define more than one variable for pkg-config

Before Meson 1.3.0, this would not do what we meant (instead defining
prefix to a wrong value composed from the remaining arguments).

The only reason we needed to redefine prefix in the first place is that
bash-completion older than 2.10 did not allow users of its
pkg-config file to override the datadir used to compute its
completionsdir, but that was addressed in version 2.10 (2019).
Users of older bash-completion should set bubblewrap's
bash_completion_dir build option, if the automatically-discovered
default is not appropriate.

Related to https://github.com/containers/bubblewrap/issues/609



Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 0545e723
No related branches found
No related tags found
1 merge request!729Optionally emit priority level markers on bubblewrap messages
...@@ -13,7 +13,6 @@ if bash_completion_dir == '' ...@@ -13,7 +13,6 @@ if bash_completion_dir == ''
default_value: '', default_value: '',
pkgconfig: 'completionsdir', pkgconfig: 'completionsdir',
pkgconfig_define: [ pkgconfig_define: [
'prefix', get_option('prefix'),
'datadir', get_option('prefix') / get_option('datadir'), 'datadir', get_option('prefix') / get_option('datadir'),
], ],
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment