mirror of
https://github.com/swaywm/sway.git
synced 2024-11-10 20:44:01 +01:00
FALLBACK_CONFIG_DIR did not work. Fixed.
- Flag was ignored. Now it's taken into account. - Missing trailing slashes in path now behaves properly.
This commit is contained in:
parent
09feef89ee
commit
f3f77f9ff1
@ -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")
|
||||||
|
@ -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",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user