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

Fix issue #455
2016-01-21 15:15:50 -05:00 · 2016-01-21 15:15:50 -05:00 · 72f297fc71
parent d969a1dec0 c487cf71a5
commit 72f297fc71
2 changed files with 6 additions and 2 deletions
--- a/sway/CMakeLists.txt
+++ b/sway/CMakeLists.txt
@ -26,6 +26,10 @@ add_executable(sway
 	workspace.c
 )

+add_definitions(
+	-DSYSCONFDIR="${CMAKE_INSTALL_FULL_SYSCONFDIR}"
+)
+
 target_link_libraries(sway
 	sway-common
 	sway-protocols
--- a/sway/config.c
+++ b/sway/config.c
@ -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")) {