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

Fix issue #455
master
Drew DeVault 9 years ago
commit 72f297fc71

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

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

Loading…
Cancel
Save