mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #284 from gpyh/master

Browse source 
FALLBACK_CONFIG_DIR did not work. Fixed.
This commit is contained in:
Drew DeVault 2015-12-01 13:56:26 -05:00
commit 76a3868ce8
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.1.0)
project(sway C) 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}\"') add_definitions('-DFALLBACK_CONFIG_DIR=\"${FALLBACK_CONFIG_DIR}\"')
set(CMAKE_C_FLAGS "-g") set(CMAKE_C_FLAGS "-g")

2
sway/config.c
View file

@ -136,7 +136,7 @@ static char *get_config_path(void) {
"$XDG_CONFIG_HOME/sway/config", "$XDG_CONFIG_HOME/sway/config",
"$HOME/.i3/config", "$HOME/.i3/config",
"$XDG_CONFIG_HOME/i3/config", "$XDG_CONFIG_HOME/i3/config",
FALLBACK_CONFIG_DIR "config", FALLBACK_CONFIG_DIR "/config",
"/etc/i3/config", "/etc/i3/config",
}; };