Run config files through sed and install to /etc

4 files changed, 31 insertions, 11 deletions

diff --git a/config.d/security.in b/config.d/security.in
index a1efb98f..b5690dc7 100644
--- a/config.d/security.in
+++ b/config.d/security.in
@@ -6,10 +6,10 @@
 # installation.
 
 # Configures which programs are allowed to use which sway features
-permit __PREFIX__/swaylock lock
-permit __PREFIX__/swaybar panel
-permit __PREFIX__/swaybg background
-permit __PREFIX__/swaygrab screenshot
+permit __PREFIX__/bin/swaylock lock
+permit __PREFIX__/bin/swaybar panel
+permit __PREFIX__/bin/swaybg background
+permit __PREFIX__/bin/swaygrab screenshot
 
 permit * fullscreen keyboard mouse
 
diff --git a/config.in b/config.in
index ddd0fec5..3cb0525e 100644
--- a/config.in
+++ b/config.in
@@ -195,4 +195,4 @@ bar {
     }
 }
 
-include __SYSCONFDIR__/etc/sway/config.d/*
+include __SYSCONFDIR__/sway/config.d/*
diff --git a/sway/CMakeLists.txt b/sway/CMakeLists.txt
index 89388220..15fa1720 100644
--- a/sway/CMakeLists.txt
+++ b/sway/CMakeLists.txt
@@ -63,11 +63,31 @@ install(
         DESTINATION bin
         COMPONENT runtime
 )
-install(
-        FILES ${PROJECT_SOURCE_DIR}/config
-        DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/sway/
-        COMPONENT configuration
-)
+
+add_custom_target(configs ALL)
+
+function(add_config name source destination)
+    add_custom_command(
+        OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}
+        COMMAND sed -r
+            's?__PREFIX__?${CMAKE_INSTALL_PREFIX}?g\; s?__SYSCONFDIR__?${CMAKE_INSTALL_FULL_SYSCONFDIR}?g'
+            ${PROJECT_SOURCE_DIR}/${source}.in > ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}
+        DEPENDS ${PROJECT_SOURCE_DIR}/${source}.in
+        COMMENT "Generating config file ${source}"
+    )
+
+    install(
+        FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name}
+        DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/${destination}
+        COMPONENT configuration
+    )
+
+        add_custom_target(config-${name} DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${name})
+    add_dependencies(configs config-${name})
+endfunction()
+
+add_config(config config sway)
+add_config(security config.d/security sway/config.d)
 
 add_manpage(sway 1)
 add_manpage(sway 5)
diff --git a/swaylock/CMakeLists.txt b/swaylock/CMakeLists.txt
index febbd1af..4aec6424 100644
--- a/swaylock/CMakeLists.txt
+++ b/swaylock/CMakeLists.txt
@@ -42,7 +42,7 @@ install(
 
 install(
         FILES ${CMAKE_CURRENT_SOURCE_DIR}/pam/swaylock
-        DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/pam.d/
+    DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d/
         COMPONENT data
 )