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