mirror of
https://github.com/zeek/zeek.git
synced 2025-10-02 06:38:20 +00:00
cmake: Fixup BRO_PLUGIN_INSTALL_PATH references
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:
parent
1b710d5534
commit
2891b8af44
4 changed files with 4 additions and 4 deletions
|
@ -593,7 +593,7 @@ zeek_include_directories(
|
|||
install(DIRECTORY ${PROJECT_BINARY_DIR}/scripts/base/bif DESTINATION ${ZEEK_SCRIPT_INSTALL_PATH}/base)
|
||||
|
||||
# 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.
|
||||
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${PROJECT_BINARY_DIR}/scripts/base/bif)
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
#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@"
|
||||
|
|
|
@ -9,7 +9,7 @@ config_dir=@ZEEK_ETC_INSTALL_DIR@
|
|||
have_spicy=@USE_SPICY_ANALYZERS@
|
||||
include_dir=@CMAKE_INSTALL_PREFIX@/include
|
||||
lib_dir=@CMAKE_INSTALL_FULL_LIBDIR@
|
||||
plugin_dir=@BRO_PLUGIN_INSTALL_PATH@
|
||||
plugin_dir=@ZEEK_PLUGIN_DIR@
|
||||
prefix=@CMAKE_INSTALL_PREFIX@
|
||||
python_dir=@PY_MOD_INSTALL_DIR@
|
||||
script_dir=@ZEEK_SCRIPT_INSTALL_PATH@
|
||||
|
|
|
@ -5,5 +5,5 @@ zeek = https://github.com/zeek/packages
|
|||
[paths]
|
||||
state_dir = @ZEEK_ZKG_STATE_DIR@
|
||||
script_dir = @ZEEK_SCRIPT_INSTALL_PATH@/site
|
||||
plugin_dir = @BRO_PLUGIN_INSTALL_PATH@
|
||||
plugin_dir = @ZEEK_PLUGIN_DIR@
|
||||
bin_dir = @CMAKE_INSTALL_PREFIX@/bin
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue