mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-24 06:59:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use SYSCONFDIR as recommended

Browse source 
- swaylock config path not hardcoded anymore
- the unusual and weird FALLBACK_CONFIG_DIR is no more
This commit is contained in:
Yacine Hmito 2015-12-23 12:22:48 +01:00
parent 23df7ed502
commit f02cf75ff3
5 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sway/CMakeLists.txt
View file

@ -42,7 +42,7 @@ install(
)
install(
FILES ${PROJECT_SOURCE_DIR}/config
DESTINATION ${FALLBACK_CONFIG_DIR}
DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/sway/
COMPONENT configuration
)

4
sway/config.c
View file

@ -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")) {