sway

commit fa2d2c85590f8a4160d141e43c659cd751ff7471
parent 18a2646c1dc7ddbea61ed5e042c063c35ce43145
Author: Drew DeVault <sir@cmpwn.com>
Date:   Tue, 16 Oct 2018 23:50:42 +0200

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

Make SYSCONFDIR FHS compliant when "prefix" is set
Diffstat:
M
meson.build
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
@@ -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)