mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Yacine Hmito 2016-01-21 21:04:52 +01:00
parent d969a1dec0
commit c487cf71a5
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")) {