diff options
author | Yacine Hmito <yacine.hmito@gmail.com> | 2015-12-23 12:22:48 +0100 |
---|---|---|
committer | Yacine Hmito <yacine.hmito@gmail.com> | 2015-12-23 12:22:48 +0100 |
commit | f02cf75ff3b759c530f195d320c722bb30380155 (patch) | |
tree | 336c267f3f52e416a3406d487ec7a30b54e93250 /sway | |
parent | Merge pull request #396 from crondog/fixbar (diff) | |
download | sway-f02cf75ff3b759c530f195d320c722bb30380155.tar.gz sway-f02cf75ff3b759c530f195d320c722bb30380155.tar.zst sway-f02cf75ff3b759c530f195d320c722bb30380155.zip |
Use SYSCONFDIR as recommended
- swaylock config path not hardcoded anymore
- the unusual and weird FALLBACK_CONFIG_DIR is no more
Diffstat (limited to 'sway')
-rw-r--r-- | sway/CMakeLists.txt | 2 | ||||
-rw-r--r-- | sway/config.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt index 894163b8..259e9ab3 100644 --- a/sway/CMakeLists.txt +++ b/sway/CMakeLists.txt | |||
@@ -42,7 +42,7 @@ install( | |||
42 | ) | 42 | ) |
43 | install( | 43 | install( |
44 | FILES ${PROJECT_SOURCE_DIR}/config | 44 | FILES ${PROJECT_SOURCE_DIR}/config |
45 | DESTINATION ${FALLBACK_CONFIG_DIR} | 45 | DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/sway/ |
46 | COMPONENT configuration | 46 | COMPONENT configuration |
47 | ) | 47 | ) |
48 | 48 | ||
diff --git a/sway/config.c b/sway/config.c index 853a7111..1973de02 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -153,8 +153,8 @@ static char *get_config_path(void) { | |||
153 | "$XDG_CONFIG_HOME/sway/config", | 153 | "$XDG_CONFIG_HOME/sway/config", |
154 | "$HOME/.i3/config", | 154 | "$HOME/.i3/config", |
155 | "$XDG_CONFIG_HOME/i3/config", | 155 | "$XDG_CONFIG_HOME/i3/config", |
156 | FALLBACK_CONFIG_DIR "/config", | 156 | "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sway/config", |
157 | "/etc/i3/config", | 157 | "${CMAKE_INSTALL_FULL_SYSCONFDIR}/i3/config", |
158 | }; | 158 | }; |
159 | 159 | ||
160 | if (!getenv("XDG_CONFIG_HOME")) { | 160 | if (!getenv("XDG_CONFIG_HOME")) { |