diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-10-16 23:50:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-16 23:50:42 +0200 |
| commit | fa2d2c85590f8a4160d141e43c659cd751ff7471 (patch) | |
| tree | abfb0ab2a790d7f8f4d4113422a91e02dce75727 | |
| parent | 18a2646c1dc7ddbea61ed5e042c063c35ce43145 (diff) | |
| parent | 027928bdebad4b2d79b7e89270c0a0c7e6bfe999 (diff) | |
Merge pull request #2855 from SpeedJack/sysconfdir-fhs-compliant
Make SYSCONFDIR FHS compliant when "prefix" is set
| -rw-r--r-- | meson.build | 4 |
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) |