sway

commit c487cf71a5cb5617053868a3db1f4a473ff99921
parent d969a1dec0be697f6fe4bea52ea5559e768ef18f
Author: Yacine Hmito <yacine.hmito@gmail.com>
Date:   Thu, 21 Jan 2016 21:04:52 +0100

Fix issue #455

CMAKE_INSTALL_FULL_SYSCONFIG is not actually passed to
the C preprocessor. I remember it working, so I must have
messed up somewhere last time I touched this.
This is fixed by manually passing its value to the C preprocessor
through the SYSCONFDIR definition

Diffstat:
M
sway/CMakeLists.txt
 | 
4
++++
M
sway/config.c
 | 
4
++--

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git 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
diff --git 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")) {