Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cmake: Fixup BRO_PLUGIN_INSTALL_PATH references

Browse source 
Commit 19cbb328a9 removed setting of
BRO_PLUGIN_INSTALL_PATH in favor of ZEEK_PLUGIN_DIR. Replace left-over
references the former.
This commit is contained in:
Arne Welzel 2023-04-24 12:15:35 +02:00
parent 1b710d5534
commit 2891b8af44
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CMakeLists.txt
View file

@ -593,7 +593,7 @@ zeek_include_directories(
install(DIRECTORY ${PROJECT_BINARY_DIR}/scripts/base/bif DESTINATION ${ZEEK_SCRIPT_INSTALL_PATH}/base) install(DIRECTORY ${PROJECT_BINARY_DIR}/scripts/base/bif DESTINATION ${ZEEK_SCRIPT_INSTALL_PATH}/base)
# Create plugin directory at install time. # Create plugin directory at install time.
install(DIRECTORY DESTINATION ${BRO_PLUGIN_INSTALL_PATH}) install(DIRECTORY DESTINATION ${ZEEK_PLUGIN_DIR})
# Make clean removes the bif directory. # Make clean removes the bif directory.
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${PROJECT_BINARY_DIR}/scripts/base/bif) set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${PROJECT_BINARY_DIR}/scripts/base/bif)

2
src/util-config.h.in
View file

@ -1,3 +1,3 @@
#define ZEEK_SCRIPT_INSTALL_PATH "@ZEEK_SCRIPT_INSTALL_PATH@" #define ZEEK_SCRIPT_INSTALL_PATH "@ZEEK_SCRIPT_INSTALL_PATH@"
#define BRO_PLUGIN_INSTALL_PATH "@BRO_PLUGIN_INSTALL_PATH@" #define BRO_PLUGIN_INSTALL_PATH "@ZEEK_PLUGIN_DIR@"
#define DEFAULT_ZEEKPATH "@DEFAULT_ZEEKPATH@" #define DEFAULT_ZEEKPATH "@DEFAULT_ZEEKPATH@"

2
zeek-config.in
View file

@ -9,7 +9,7 @@ config_dir=@ZEEK_ETC_INSTALL_DIR@
have_spicy=@USE_SPICY_ANALYZERS@ have_spicy=@USE_SPICY_ANALYZERS@
include_dir=@CMAKE_INSTALL_PREFIX@/include include_dir=@CMAKE_INSTALL_PREFIX@/include
lib_dir=@CMAKE_INSTALL_FULL_LIBDIR@ lib_dir=@CMAKE_INSTALL_FULL_LIBDIR@
plugin_dir=@BRO_PLUGIN_INSTALL_PATH@ plugin_dir=@ZEEK_PLUGIN_DIR@
prefix=@CMAKE_INSTALL_PREFIX@ prefix=@CMAKE_INSTALL_PREFIX@
python_dir=@PY_MOD_INSTALL_DIR@ python_dir=@PY_MOD_INSTALL_DIR@
script_dir=@ZEEK_SCRIPT_INSTALL_PATH@ script_dir=@ZEEK_SCRIPT_INSTALL_PATH@

2
zkg-config.in
View file

@ -5,5 +5,5 @@ zeek = https://github.com/zeek/packages
[paths] [paths]
state_dir = @ZEEK_ZKG_STATE_DIR@ state_dir = @ZEEK_ZKG_STATE_DIR@
script_dir = @ZEEK_SCRIPT_INSTALL_PATH@/site script_dir = @ZEEK_SCRIPT_INSTALL_PATH@/site
plugin_dir = @BRO_PLUGIN_INSTALL_PATH@ plugin_dir = @ZEEK_PLUGIN_DIR@
bin_dir = @CMAKE_INSTALL_PREFIX@/bin bin_dir = @CMAKE_INSTALL_PREFIX@/bin