From 6d58fe5d74be47677353de5eb9a732b37831aed8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 18 May 2017 12:04:55 -0400
Subject: [PATCH] Revert back to just installing //etc/zm/zm.conf

---
 CMakeLists.txt | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 630030466..22748ba4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -838,16 +838,17 @@ else(zmconfgen_result EQUAL 0)
 endif(zmconfgen_result EQUAL 0)
 
 # Install zm.conf
-install(CODE "
-if (NOT EXISTS \"${ZM_CONFIG_DIR}/zm.conf\")
-  message(STATUS \"No zm.conf at ${CMAKE_CURRENT_BINARY_DIR}/zm.conf. Will install a new zm.conf\")
-  install(FILES \"${CMAKE_CURRENT_BINARY_DIR}/zm.conf\" DESTINATION \"${ZM_CONFIG_DIR}\")
-else (NOT EXISTS \"${ZM_CONFIG_DIR}/zm.conf\")
-  message(STATUS \"Found zm.conf at ${CMAKE_CURRENT_BINARY_DIR}/zm.conf. Not overwriting.  Installing zm.conf.new instead.\")
-  file(RENAME \"${CMAKE_CURRENT_BINARY_DIR}/zm.conf\" \"${CMAKE_CURRENT_BINARY_DIR}/zm.conf.new\")
-  install(FILES \"${CMAKE_CURRENT_BINARY_DIR}/zm.conf.new\" DESTINATION \"${ZM_CONFIG_DIR}\")
-endif(NOT EXISTS \"${ZM_CONFIG_DIR}/zm.conf\")
-")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}")
+#install(CODE "
+#if (NOT EXISTS \"${ZM_CONFIG_DIR}/zm.conf\")
+  #message(STATUS \"No zm.conf at ${CMAKE_CURRENT_BINARY_DIR}/zm.conf. Will install a new zm.conf\")
+  #install(FILES \"${CMAKE_CURRENT_BINARY_DIR}/zm.conf\" DESTINATION \"${ZM_CONFIG_DIR}\")
+#else (NOT EXISTS \"${ZM_CONFIG_DIR}/zm.conf\")
+  #message(STATUS \"Found zm.conf at ${CMAKE_CURRENT_BINARY_DIR}/zm.conf. Not overwriting.  Installing zm.conf.new instead.\")
+  #file(RENAME \"${CMAKE_CURRENT_BINARY_DIR}/zm.conf\" \"${CMAKE_CURRENT_BINARY_DIR}/zm.conf.new\")
+  #install(FILES \"${CMAKE_CURRENT_BINARY_DIR}/zm.conf.new\" DESTINATION \"${ZM_CONFIG_DIR}\")
+#endif(NOT EXISTS \"${ZM_CONFIG_DIR}/zm.conf\")
+#")
 
 
 # Uninstall target