blob: 63c213e3a69e42710cbdd1ac89ccfb0ad6766c6f (
plain) (
blame)
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
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d3da0c90..d37931c1b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -503,11 +503,6 @@ if (NOT MSVC)
set(HAVE_SUPERVISOR true)
endif ()
-install(DIRECTORY DESTINATION ${ZEEK_ETC_INSTALL_DIR})
-install(DIRECTORY DESTINATION ${ZEEK_STATE_DIR})
-install(DIRECTORY DESTINATION ${ZEEK_SPOOL_DIR})
-install(DIRECTORY DESTINATION ${ZEEK_LOG_DIR})
-
configure_file(zeek-path-dev.in ${CMAKE_CURRENT_BINARY_DIR}/zeek-path-dev)
file(
@@ -1198,7 +1193,7 @@ if (INSTALL_ZKG)
@ONLY)
install(DIRECTORY DESTINATION var/lib/zkg)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zkg-config DESTINATION ${ZEEK_ZKG_CONFIG_DIR}
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zkg-config DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/zeek/zkg
RENAME config)
endif ()
Submodule auxil/zeekctl contains modified content
diff --git a/auxil/zeekctl/CMakeLists.txt b/auxil/zeekctl/CMakeLists.txt
index 1ebe7c2..1435509 100644
--- a/auxil/zeekctl/CMakeLists.txt
+++ b/auxil/zeekctl/CMakeLists.txt
@@ -9,7 +9,7 @@ file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" VERSION LIMIT_COUNT 1)
set(PREFIX "${CMAKE_INSTALL_PREFIX}")
set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
set(ZEEKSCRIPTDIR "${ZEEK_SCRIPT_INSTALL_PATH}")
-set(ETC "${ZEEK_ETC_INSTALL_DIR}")
+set(ETC "${CMAKE_INSTALL_SYSCONFDIR}")
########################################################################
## Dependency Configuration
@@ -200,38 +200,9 @@ else ()
set(LOGS ${VAR}/logs)
endif ()
-if ( BINARY_PACKAGING_MODE AND NOT APPLE )
- # Packaging for Apple-based systems does not need special logic
- # because many probably find it more convenient for uninstalling
- # when everything resides under a common prefix (since there's no
- # native package management system)
- set(perms OWNER_READ OWNER_WRITE OWNER_EXECUTE
- GROUP_READ GROUP_WRITE GROUP_EXECUTE
- WORLD_READ WORLD_WRITE WORLD_EXECUTE)
-
- install(DIRECTORY DESTINATION ${SPOOL}
- DIRECTORY_PERMISSIONS ${perms})
- install(DIRECTORY DESTINATION ${SPOOL}/tmp
- DIRECTORY_PERMISSIONS ${perms})
- install(DIRECTORY DESTINATION ${SPOOL}/brokerstore
- DIRECTORY_PERMISSIONS ${perms})
- install(DIRECTORY DESTINATION ${LOGS}
- DIRECTORY_PERMISSIONS ${perms})
- set(EMPTY_WORLD_DIRS
- "${EMPTY_WORLD_DIRS} ${SPOOL} ${SPOOL}/tmp ${LOGS}"
- CACHE STRING "" FORCE)
-else ()
- install(DIRECTORY DESTINATION ${SPOOL})
- install(DIRECTORY DESTINATION ${SPOOL}/tmp)
- install(DIRECTORY DESTINATION ${SPOOL}/brokerstore)
- install(DIRECTORY DESTINATION ${LOGS})
-endif ()
-
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/zeekctl-config.sh
"# Automatically generated. Do not edit.\n")
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeekctl-config.sh DESTINATION ${SPOOL})
-InstallSymlink(${SPOOL}/zeekctl-config.sh
- ${PREFIX}/share/zeekctl/scripts/zeekctl-config.sh)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeekctl-config.sh DESTINATION ${PREFIX}/share/zeekctl/scripts)
# A couple of configuration options that are needed are placed in here.
configure_file(etc/zeekctl.cfg.in
|