projectatomic/bubblewrap
1
0
Fork 0
mirror of https://github.com/projectatomic/bubblewrap.git synced 2026-02-05 15:45:22 +01:00
Code Issues Releases Activity

Merge pull request #493 from smcv/bwrapdir

Browse Source 
meson: Allow installation directory to be set explicitly
This commit is contained in:
Simon McVittie
2022-05-10 16:30:17 +01:00
committed by GitHub
parent 14d6a7f0df bda58e03a1
commit ade6bb0ff7
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,
)
if meson.is_subproject()
bwrapdir = get_option('libexecdir')
if meson.is_subproject() and get_option('program_prefix') == ''
error('program_prefix option must be set when bwrap is a subproject')
endif
if get_option('program_prefix') == ''
error('program_prefix option must be set when bwrap is a subproject')
endif
if get_option('bwrapdir') != ''
bwrapdir = get_option('bwrapdir')
elif meson.is_subproject()
bwrapdir = get_option('libexecdir')
else
bwrapdir = get_option('bindir')
endif

5
meson_options.txt
View File

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