From 6aa5145782ecb56175bb9d98a62d43cc84155641 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Wed, 11 Jun 2025 14:46:41 -0700 Subject: [PATCH] Deprecate BRO_PLUGIN_INSTALL_PATH constant --- cmake_templates/zeek-config-paths.h.in | 3 ++- src/util.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake_templates/zeek-config-paths.h.in b/cmake_templates/zeek-config-paths.h.in index 89c0dc436f..9cedf0d70e 100644 --- a/cmake_templates/zeek-config-paths.h.in +++ b/cmake_templates/zeek-config-paths.h.in @@ -3,7 +3,8 @@ #pragma once 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 DEFAULT_ZEEKPATH[] = "@DEFAULT_ZEEKPATH@"; constexpr char ZEEK_SPICY_MODULE_PATH[] = "@ZEEK_SPICY_MODULE_PATH@"; diff --git a/src/util.cc b/src/util.cc index 2a59ea8a2a..60d502e36c 100644 --- a/src/util.cc +++ b/src/util.cc @@ -1593,7 +1593,7 @@ const char* zeek_plugin_path() { const char* path = getenv("ZEEK_PLUGIN_PATH"); if ( ! path ) - path = BRO_PLUGIN_INSTALL_PATH; + path = ZEEK_PLUGIN_INSTALL_PATH; return path; }