colin/bubblewrap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: Allow installation directory to be set explicitly

Browse Source 
Overriding the libexecdir via default_options doesn't always work when
used as a subproject.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie
2022-04-05 14:55:11 +01:00
parent 34a8c8bc87
commit bda58e03a1
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
meson.build
View File

@@ -101,12 +101,14 @@ configure_file(
configuration : cdata, configuration : cdata,
) )
if meson.is_subproject() if meson.is_subproject() and get_option('program_prefix') == ''
bwrapdir = get_option('libexecdir') error('program_prefix option must be set when bwrap is a subproject')
endif
if get_option('program_prefix') == '' if get_option('bwrapdir') != ''
error('program_prefix option must be set when bwrap is a subproject') bwrapdir = get_option('bwrapdir')
endif elif meson.is_subproject()
bwrapdir = get_option('libexecdir')
else else
bwrapdir = get_option('bindir') bwrapdir = get_option('bindir')
endif endif

5
meson_options.txt
View File

@@ -10,6 +10,11 @@ option(
description : 'install bash completion script in this directory', description : 'install bash completion script in this directory',
value : '', value : '',
) )
option(
'bwrapdir',
type : 'string',
description : 'install bwrap in this directory [default: bindir, or libexecdir in subprojects]',
)
option( option(
'man', 'man',
type : 'feature', type : 'feature',