diff options
| author | Drew DeVault <sir@cmpwn.com> | 2015-12-23 07:52:55 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2015-12-23 07:52:55 -0500 |
| commit | 72043b231d99162d917c3234bfbf99b6a9e29945 (patch) | |
| tree | 336c267f3f52e416a3406d487ec7a30b54e93250 /sway | |
| parent | 23df7ed502b20bf264d85af2aef8c933e393f9ee (diff) | |
| parent | f02cf75ff3b759c530f195d320c722bb30380155 (diff) | |
| download | sway-72043b231d99162d917c3234bfbf99b6a9e29945.tar.xz | |
Merge pull request #399 from gpyh/dont-hardcode-path
Use SYSCONFDIR as recommended
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( ) install( FILES ${PROJECT_SOURCE_DIR}/config - DESTINATION ${FALLBACK_CONFIG_DIR} + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/sway/ COMPONENT configuration ) 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) { "$XDG_CONFIG_HOME/sway/config", "$HOME/.i3/config", "$XDG_CONFIG_HOME/i3/config", - FALLBACK_CONFIG_DIR "/config", - "/etc/i3/config", + "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sway/config", + "${CMAKE_INSTALL_FULL_SYSCONFDIR}/i3/config", }; if (!getenv("XDG_CONFIG_HOME")) { |