mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2855 from SpeedJack/sysconfdir-fhs-compliant

Browse source 
Make SYSCONFDIR FHS compliant when "prefix" is set
This commit is contained in:
Drew DeVault 2018-10-16 23:50:42 +02:00 • committed by GitHub
commit fa2d2c8559
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -114,7 +114,7 @@ if scdoc.found()
endforeach endforeach
endif endif
add_project_arguments('-DSYSCONFDIR="/@0@/@1@"'.format(prefix, sysconfdir), language : 'c') add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c')
version = get_option('sway-version') version = get_option('sway-version')
if version != '' if version != ''
@ -157,7 +157,7 @@ subdir('swaynag')
subdir('swaylock') subdir('swaylock')
config = configuration_data() config = configuration_data()
config.set('sysconfdir', join_paths(prefix, sysconfdir)) 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)