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

Deprecate BRO_PLUGIN_INSTALL_PATH constant

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-06-11 14:46:41 -07:00
parent 37be47328e
commit 6aa5145782
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cmake_templates/zeek-config-paths.h.in
View file

@ -3,7 +3,8 @@
#pragma once #pragma once
constexpr char ZEEK_SCRIPT_INSTALL_PATH[] = "@ZEEK_SCRIPT_INSTALL_PATH@"; constexpr char ZEEK_SCRIPT_INSTALL_PATH[] = "@ZEEK_SCRIPT_INSTALL_PATH@";
constexpr char BRO_PLUGIN_INSTALL_PATH[] = "@ZEEK_PLUGIN_DIR@"; [[deprecated("Remove in v8.1. Use ZEEK_PLUGIN_INSTALL_PATH")]] constexpr char BRO_PLUGIN_INSTALL_PATH[] =
"@ZEEK_PLUGIN_DIR@";
constexpr char ZEEK_PLUGIN_INSTALL_PATH[] = "@ZEEK_PLUGIN_DIR@"; constexpr char ZEEK_PLUGIN_INSTALL_PATH[] = "@ZEEK_PLUGIN_DIR@";
constexpr char DEFAULT_ZEEKPATH[] = "@DEFAULT_ZEEKPATH@"; constexpr char DEFAULT_ZEEKPATH[] = "@DEFAULT_ZEEKPATH@";
constexpr char ZEEK_SPICY_MODULE_PATH[] = "@ZEEK_SPICY_MODULE_PATH@"; constexpr char ZEEK_SPICY_MODULE_PATH[] = "@ZEEK_SPICY_MODULE_PATH@";

2
src/util.cc
View file

@ -1593,7 +1593,7 @@ const char* zeek_plugin_path() {
const char* path = getenv("ZEEK_PLUGIN_PATH"); const char* path = getenv("ZEEK_PLUGIN_PATH");
if ( ! path ) if ( ! path )
path = BRO_PLUGIN_INSTALL_PATH; path = ZEEK_PLUGIN_INSTALL_PATH;
return path; return path;
} }