sway

commit 76a3868ce8b4b43bb45bb69daa47bd0e25ce9255
parent 3075b4a61debb123c85bb1aa6a7a16190ba3c0ad
Author: Drew DeVault <sir@cmpwn.com>
Date:   Tue,  1 Dec 2015 13:56:26 -0500

Merge pull request #284 from gpyh/master

FALLBACK_CONFIG_DIR did not work. Fixed.
Diffstat:
M
CMakeLists.txt
 | 
3
++-
M
sway/config.c
 | 
2
+-

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git 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
@@ -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",
 	};