blob: 7d281f8dbe0000bdbe341eedd9e63604232bc5e9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
CMakeLists.txt | 2 +-
zmap_conf_install.cmake.in | 7 -------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebf9316..f18c112 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,4 +77,4 @@ add_subdirectory(src)
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 "${PROJECT_SOURCE_DIR}/zmap_conf_install.cmake")
+install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/zmap_conf_install.cmake")
diff --git a/zmap_conf_install.cmake.in b/zmap_conf_install.cmake.in
index 7f36f12..d5fe9d9 100644
--- a/zmap_conf_install.cmake.in
+++ b/zmap_conf_install.cmake.in
@@ -1,10 +1,3 @@
-message(STATUS "Creating /etc/zmap")
-if (NOT EXISTS "/etc/zmap/")
- file(MAKE_DIRECTORY "/etc/zmap")
-else()
- message(STATUS "/etc/zmap exists, skipping...")
-endif()
-
message(STATUS "Installing blacklist.conf...")
if (NOT EXISTS "/etc/zmap/blacklist.conf")
file(INSTALL "${PROJECT_SOURCE_DIR}/conf/blacklist.conf" DESTINATION "/etc/zmap")
|
GitWeb
