ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

revert change to not overwite zm.conf. It's not right, and it is screwing up package building

pull/1132/merge
Isaac Connor 2015-10-30 11:28:34 -04:00
parent e37cf0e218
commit 2115eacdd0
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -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(