From f02cf75ff3b759c530f195d320c722bb30380155 Mon Sep 17 00:00:00 2001 From: Yacine Hmito Date: Wed, 23 Dec 2015 12:22:48 +0100 Subject: Use SYSCONFDIR as recommended - swaylock config path not hardcoded anymore - the unusual and weird FALLBACK_CONFIG_DIR is no more --- sway/CMakeLists.txt | 2 +- sway/config.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sway') diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt index 894163b8..259e9ab3 100644 --- a/sway/CMakeLists.txt +++ b/sway/CMakeLists.txt @@ -42,7 +42,7 @@ install( ) install( FILES ${PROJECT_SOURCE_DIR}/config - DESTINATION ${FALLBACK_CONFIG_DIR} + DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/sway/ COMPONENT configuration ) diff --git a/sway/config.c b/sway/config.c index 853a7111..1973de02 100644 --- a/sway/config.c +++ b/sway/config.c @@ -153,8 +153,8 @@ static char *get_config_path(void) { "$XDG_CONFIG_HOME/sway/config", "$HOME/.i3/config", "$XDG_CONFIG_HOME/i3/config", - FALLBACK_CONFIG_DIR "/config", - "/etc/i3/config", + "${CMAKE_INSTALL_FULL_SYSCONFDIR}/sway/config", + "${CMAKE_INSTALL_FULL_SYSCONFDIR}/i3/config", }; if (!getenv("XDG_CONFIG_HOME")) { -- cgit v1.2.3