diff options
| author |  Niccolò Scatena <speedjack95@gmail.com> | 2018-10-16 19:35:06 +0200 |
|---|---|---|
| committer | Niccolò Scatena <speedjack95@gmail.com> | 2018-10-16 19:35:06 +0200 |
| commit | 615d4bf958c4d5075b041dc8b3b9ae449f55828f (patch) | |
| tree | 34afa82d23bb5e342762febc7bc8d279765c3938 /meson.build | |
| parent | Merge pull request #2852 from RyanDwyer/back-and-forth-crash (diff) | |
| download | sway-615d4bf958c4d5075b041dc8b3b9ae449f55828f.tar.gz sway-615d4bf958c4d5075b041dc8b3b9ae449f55828f.tar.zst sway-615d4bf958c4d5075b041dc8b3b9ae449f55828f.zip | |
Revert "Fix SYSCONFDIR to include "prefix""
This reverts commit 6942f5b6845b2cc572ec378365771a34caf50ba1.
SYSCONFDIR should be "/etc" even when prefix="/usr" to be FHS compliant.
This is the default in meson from v0.44.
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 31c3e53e..4fab12d9 100644 --- a/meson.build +++ b/meson.build | |||
| @@ -114,7 +114,7 @@ if scdoc.found() | |||
| 114 | endforeach | 114 | endforeach |
| 115 | endif | 115 | endif |
| 116 | 116 | ||
| 117 | add_project_arguments('-DSYSCONFDIR="/@0@/@1@"'.format(prefix, sysconfdir), language : 'c') | 117 | add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c') |
| 118 | 118 | ||
| 119 | version = get_option('sway-version') | 119 | version = get_option('sway-version') |
| 120 | if version != '' | 120 | if version != '' |