alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #456 from gpyh/fix-config-dir

Browse source 
Fix issue #455
This commit is contained in:
Drew DeVault 2016-01-21 15:15:50 -05:00
parent d969a1dec0 c487cf71a5
commit 72f297fc71
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/CMakeLists.txt
View file

@ -26,6 +26,10 @@ add_executable(sway
workspace.c workspace.c
) )
add_definitions(
-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}"
)
target_link_libraries(sway target_link_libraries(sway
sway-common sway-common
sway-protocols sway-protocols

4
sway/config.c
View file

@ -197,8 +197,8 @@ 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",
"${CMAKE_INSTALL_FULL_SYSCONFDIR}/sway/config", SYSCONFDIR "/sway/config",
"${CMAKE_INSTALL_FULL_SYSCONFDIR}/i3/config", SYSCONFDIR "/i3/config",
}; };
if (!getenv("XDG_CONFIG_HOME")) { if (!getenv("XDG_CONFIG_HOME")) {