From f6609beb2c5c2394778e1069193af69f9c2b2d77 Mon Sep 17 00:00:00 2001 From: David Adrian Date: Sat, 12 Oct 2013 13:44:33 -0400 Subject: [PATCH] Don't overwrite conf files on install --- .gitignore | 1 + CMakeLists.txt | 10 ++++------ zmap_conf_install.cmake.in | 6 ++++++ 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 zmap_conf_install.cmake.in diff --git a/.gitignore b/.gitignore index 2c2e6ad..d1656df 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ lexer.c lexer.h parser.c parser.h +install_manifest.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 745f3d5..bea62ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,9 +64,7 @@ set(CMAKE_C_FLAGS_RELEASE "-O2") add_subdirectory(src) # Install conf files -FILE(GLOB CONF_FILES "conf/*") -install( - FILES - ${CONF_FILES} - DESTINATION "/etc/zmap/" - ) +FILE(GLOB CONF_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/conf" "conf/*") +message(STATUS "${CONF_FILES}") +configure_file(zmap_conf_install.cmake.in zmap_conf_install.cmake) +install(SCRIPT zmap_conf_install.cmake) diff --git a/zmap_conf_install.cmake.in b/zmap_conf_install.cmake.in new file mode 100644 index 0000000..358a97d --- /dev/null +++ b/zmap_conf_install.cmake.in @@ -0,0 +1,6 @@ +foreach(conf_file ${CONF_FILES}) + message(STATUS "${conf_file}") + if(NOT EXISTS "/etc/zmap/${conf_file}") + file(INSTALL "conf/${conf_file}" DESTINATION "/etc/zmap") + endif() +endforeach()