diff options
| author | Drew DeVault <sir@cmpwn.com> | 2015-12-01 13:56:26 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2015-12-01 13:56:26 -0500 |
| commit | 76a3868ce8b4b43bb45bb69daa47bd0e25ce9255 (patch) | |
| tree | dc64bfc3a3fe77cf607c2251f61caa3cb6cdc4a1 | |
| parent | 3075b4a61debb123c85bb1aa6a7a16190ba3c0ad (diff) | |
| parent | f3f77f9ff1912a2b05304ba8a5278f42e16b6c1b (diff) | |
| download | sway-76a3868ce8b4b43bb45bb69daa47bd0e25ce9255.tar.xz | |
Merge pull request #284 from gpyh/master
FALLBACK_CONFIG_DIR did not work. Fixed.
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | sway/config.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9e1e1dde..68dd7fa3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.1.0) project(sway C) -set(FALLBACK_CONFIG_DIR "/etc/sway/") +set(FALLBACK_CONFIG_DIR "/etc/sway" CACHE PATH + "Fallback config directory defaults to /etc/sway") add_definitions('-DFALLBACK_CONFIG_DIR=\"${FALLBACK_CONFIG_DIR}\"') set(CMAKE_C_FLAGS "-g") diff --git a/sway/config.c b/sway/config.c index dac3e8f8..6a1d172b 100644 --- a/sway/config.c +++ b/sway/config.c @@ -136,7 +136,7 @@ static char *get_config_path(void) { "$XDG_CONFIG_HOME/sway/config", "$HOME/.i3/config", "$XDG_CONFIG_HOME/i3/config", - FALLBACK_CONFIG_DIR "config", + FALLBACK_CONFIG_DIR "/config", "/etc/i3/config", }; |