mirror/sway
1
1
Fork 0
mirror of https://github.com/swaywm/sway synced 2024-11-18 00:24:17 +01:00
Code Issues

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
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
)
add_definitions(
-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}"
)
target_link_libraries(sway
sway-common
sway-protocols

4
sway/config.c
View File

@ -197,8 +197,8 @@ static char *get_config_path(void) {
"$XDG_CONFIG_HOME/sway/config",
"$HOME/.i3/config",
"$XDG_CONFIG_HOME/i3/config",
"${CMAKE_INSTALL_FULL_SYSCONFDIR}/sway/config",
"${CMAKE_INSTALL_FULL_SYSCONFDIR}/i3/config",
SYSCONFDIR "/sway/config",
SYSCONFDIR "/i3/config",
};
if (!getenv("XDG_CONFIG_HOME")) {