From 954ceb3c6a6087cc7721e1b09601012d903848ff Mon Sep 17 00:00:00 2001 From: Gerd von Egidy Date: Sun, 4 May 2014 20:46:13 +0200 Subject: [PATCH] Fix CMake escaping. Refs #4794 --- etc/CMakeLists.txt | 4 ++-- etc/systemd/icinga2.sysconfig.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt index fc1f6865d..4ae50d2b4 100644 --- a/etc/CMakeLists.txt +++ b/etc/CMakeLists.txt @@ -89,14 +89,14 @@ if(NOT WIN32) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) else() - configure_file(systemd/icinga2.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/systemd/icinga2.service) + configure_file(systemd/icinga2.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/systemd/icinga2.service @ONLY) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/systemd/icinga2.service DESTINATION ${DESTDIR}/usr/lib/systemd/system PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_EXECUTE WORLD_READ ) - configure_file(systemd/icinga2.sysconfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/systemd/icinga2) + configure_file(systemd/icinga2.sysconfig.cmake ${CMAKE_CURRENT_BINARY_DIR}/systemd/icinga2 @ONLY) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/systemd/icinga2 DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/sysconfig diff --git a/etc/systemd/icinga2.sysconfig.cmake b/etc/systemd/icinga2.sysconfig.cmake index 2ea3bca39..545fcf7c8 100644 --- a/etc/systemd/icinga2.sysconfig.cmake +++ b/etc/systemd/icinga2.sysconfig.cmake @@ -1,7 +1,7 @@ ICINGA2_CONFIG_FILE=@CMAKE_INSTALL_FULL_SYSCONFDIR@/icinga2/icinga2.conf ICINGA2_STATE_DIR=@CMAKE_INSTALL_FULL_LOCALSTATEDIR@ -ICINGA2_ERROR_LOG=$ICINGA2_STATE_DIR/log/icinga2/error.log -ICINGA2_LOG=$ICINGA2_STATE_DIR/log/icinga2/icinga2.log +ICINGA2_ERROR_LOG=${ICINGA2_STATE_DIR}/log/icinga2/error.log +ICINGA2_LOG=${ICINGA2_STATE_DIR}/log/icinga2/icinga2.log ICINGA2_USER=@ICINGA2_USER@ ICINGA2_GROUP=@ICINGA2_GROUP@ ICINGA2_COMMAND_USER=@ICINGA2_COMMAND_USER@ -- 2.40.0