sway

commit f02cf75ff3b759c530f195d320c722bb30380155
parent 23df7ed502b20bf264d85af2aef8c933e393f9ee
Author: Yacine Hmito <yacine.hmito@gmail.com>
Date:   Wed, 23 Dec 2015 12:22:48 +0100

Use SYSCONFDIR as recommended

- swaylock config path not hardcoded anymore
- the unusual and weird FALLBACK_CONFIG_DIR is no more

Diffstat:
M
CMakeLists.txt
 | 
4
----
M
README.md
 | 
5
++---
M
sway/CMakeLists.txt
 | 
2
+-
M
sway/config.c
 | 
4
++--
M
swaylock/CMakeLists.txt
 | 
2
+-

5 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,10 +2,6 @@ cmake_minimum_required(VERSION 3.1.0)
 
 project(sway C)
 
-set(FALLBACK_CONFIG_DIR "/etc/sway" CACHE PATH
-  "Fallback config directory defaults to /etc/sway")
-add_definitions(-DFALLBACK_CONFIG_DIR=\"${FALLBACK_CONFIG_DIR}\")
-
 set(CMAKE_C_FLAGS "-g")
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_C_EXTENSIONS OFF)
diff --git a/README.md b/README.md
@@ -66,9 +66,8 @@ On systems without logind, you need to suid the sway binary:
 
 If you already use i3, then copy your i3 config to `~/.config/sway/config` and
 it'll work out of the box. Otherwise, copy the sample configuration file to
-`~/.config/sway/config`. It is located at `/etc/sway/config`, unless the 
-`DFALLBACK_CONFIG_DIR` flag has been set. Run `man 5 sway` for information on
-the configuration.
+`~/.config/sway/config`. It is usually located at `/etc/sway/config`.
+Run `man 5 sway` for information on the configuration.
 
 ## Running
 
diff --git 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
@@ -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")) {
diff --git a/swaylock/CMakeLists.txt b/swaylock/CMakeLists.txt
@@ -39,6 +39,6 @@ install(
 
 install(
 	FILES ${CMAKE_CURRENT_SOURCE_DIR}/pam/swaylock
-	DESTINATION /etc/pam.d/
+	DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/pam.d/
 	COMPONENT data
 )