diff options
| author |  Niccolò Scatena <speedjack95@gmail.com> | 2018-10-16 19:44:45 +0200 |
|---|---|---|
| committer | Niccolò Scatena <speedjack95@gmail.com> | 2018-10-16 19:44:45 +0200 |
| commit | 027928bdebad4b2d79b7e89270c0a0c7e6bfe999 (patch) | |
| tree | abfb0ab2a790d7f8f4d4113422a91e02dce75727 /meson.build | |
| parent | Revert "Fix SYSCONFDIR to include "prefix"" (diff) | |
| download | sway-027928bdebad4b2d79b7e89270c0a0c7e6bfe999.tar.gz sway-027928bdebad4b2d79b7e89270c0a0c7e6bfe999.tar.zst sway-027928bdebad4b2d79b7e89270c0a0c7e6bfe999.zip | |
Set SYSCONFDIR to /etc even when "prefix" is set
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 4fab12d9..3fb1e81e 100644 --- a/meson.build +++ b/meson.build | |||
| @@ -157,7 +157,7 @@ subdir('swaynag') | |||
| 157 | subdir('swaylock') | 157 | subdir('swaylock') |
| 158 | 158 | ||
| 159 | config = configuration_data() | 159 | config = configuration_data() |
| 160 | config.set('sysconfdir', join_paths(prefix, sysconfdir)) | 160 | config.set('sysconfdir', sysconfdir) |
| 161 | config.set('datadir', join_paths(prefix, datadir)) | 161 | config.set('datadir', join_paths(prefix, datadir)) |
| 162 | config.set('prefix', prefix) | 162 | config.set('prefix', prefix) |
| 163 | 163 | ||