diff options
| author | Yacine Hmito <yacine.hmito@gmail.com> | 2016-01-21 21:04:52 +0100 |
|---|---|---|
| committer | Yacine Hmito <yacine.hmito@gmail.com> | 2016-01-21 21:08:18 +0100 |
| commit | c487cf71a5cb5617053868a3db1f4a473ff99921 (patch) | |
| tree | 4252d87c803f6be90a627cbcc60b0919481ed900 | |
| parent | d969a1dec0be697f6fe4bea52ea5559e768ef18f (diff) | |
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
| -rw-r--r-- | sway/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | sway/config.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt index f7cc88ab..d23c80b0 100644 --- 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 index d8e1e938..c4614521 100644 --- 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")) { |