From 2115eacdd00abf101ed959771185c54606a960bb Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 30 Oct 2015 11:28:34 -0400 Subject: [PATCH] revert change to not overwite zm.conf. It's not right, and it is screwing up package building --- CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f1b44109..ea67474d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -715,11 +715,7 @@ else(zmconfgen_result EQUAL 0) endif(zmconfgen_result EQUAL 0) # Install zm.conf -if(NOT EXISTS "${ZM_CONFIG_DIR}/zm.conf") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}") -else(NOT EXISTS "${ZM_CONFIG_DIR}/zm.conf") -install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}" RENAME "zm.conf.new") -endif(NOT EXISTS "${ZM_CONFIG_DIR}/zm.conf") # Uninstall target configure_file(