aboutsummaryrefslogtreecommitdiff
path: root/meson.build
diff options
context:
space:
mode:
authorBrian Ashworth <RedSoxFan@users.noreply.github.com>2018-10-16 21:31:29 -0400
committerGitHub <noreply@github.com>2018-10-16 21:31:29 -0400
commit3a5a8aa5adec0ff86f75895bde141d93dbb58d34 (patch)
tree8a17c1f3dfa4c4f009063b6c53e93223837fad10 /meson.build
parentcfc533aa9cadb0a382ac4ddfc8c011657febb2da (diff)
parentfa2d2c85590f8a4160d141e43c659cd751ff7471 (diff)
downloadsway-3a5a8aa5adec0ff86f75895bde141d93dbb58d34.tar.xz
Merge branch 'master' into feature/2842_TruncateMessage
Diffstat (limited to 'meson.build')
-rw-r--r--meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build
index 31c3e53e..3fb1e81e 100644
--- 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)