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 | Merge pull request #2852 from RyanDwyer/back-and-forth-crash (diff) | |
| parent | Set SYSCONFDIR to /etc even when "prefix" is set (diff) | |
| download | sway-fa2d2c85590f8a4160d141e43c659cd751ff7471.tar.gz sway-fa2d2c85590f8a4160d141e43c659cd751ff7471.tar.zst sway-fa2d2c85590f8a4160d141e43c659cd751ff7471.zip | |
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() | |||
| 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 != '' |
| @@ -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 | ||