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

Make SYSCONFDIR FHS compliant when "prefix" is set
master
Drew DeVault 6 years ago committed by GitHub
commit fa2d2c8559
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -114,7 +114,7 @@ if scdoc.found()
endforeach
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')
if version != ''
@ -157,7 +157,7 @@ subdir('swaynag')
subdir('swaylock')
config = configuration_data()
config.set('sysconfdir', join_paths(prefix, sysconfdir))
config.set('sysconfdir', sysconfdir)
config.set('datadir', join_paths(prefix, datadir))
config.set('prefix', prefix)

Loading…
Cancel
Save