alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Set sysconfdir to /etc only if prefix is /usr

Browse source 
PR #2855 basically hardcodes the config file path to /etc, which is a
problem on e.g. FreeBSD, where the expected path for config files of
non-base software is '/usr/local/etc'.
Meson sets sysconfdir to '/etc' explicitly only when prefix is '/usr',
so it is still possible to use '/usr/local' as prefix, and install the
config files under '/usr/local/etc'. This commit allows to do that by
setting sysconfdir based on the value of prefix.
This commit is contained in:
sghctoma 2018-10-17 15:06:55 +02:00
parent 2694fd72b6
commit af2cfa5221
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
meson.build
View file

@ -114,7 +114,13 @@ if scdoc.found()
endforeach endforeach
endif endif
add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c') # If prefix is '/usr', sysconfdir will be explicitly set to '/etc' by Meson to
# enforce FHS compliance, so we should look for configs there as well.
if prefix == '/usr'
add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c')
else
add_project_arguments('-DSYSCONFDIR="/@0@/@1@"'.format(prefix, sysconfdir), language : 'c')
endif
version = get_option('sway-version') version = get_option('sway-version')
if version != '' if version != ''
@ -157,10 +163,17 @@ subdir('swaynag')
subdir('swaylock') subdir('swaylock')
config = configuration_data() config = configuration_data()
config.set('sysconfdir', sysconfdir)
config.set('datadir', join_paths(prefix, datadir)) config.set('datadir', join_paths(prefix, datadir))
config.set('prefix', prefix) config.set('prefix', prefix)
# If prefix is '/usr', sysconfdir will be explicitly set to '/etc' by Meson to
# enforce FHS compliance, so we should look for configs there as well.
if prefix == '/usr'
config.set('sysconfdir', sysconfdir)
else
config.set('sysconfdir', join_paths(prefix, sysconfdir))
endif
configure_file( configure_file(
configuration: config, configuration: config,
input: 'config.in', input: 'config.in',