diff --git a/CHANGES b/CHANGES index e1555012ce..667548fc4a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,17 @@ +8.1.0-dev.459 | 2025-08-26 08:59:20 -0700 + + * Fix installation of symlink with `DESTDIR` (Benjamin Bannier, Corelight) + + We install test data which we also make available under an alternative + path for backwards compatibility. The installation of this symlink did + not take `DESTDIR` installs like used by Zeek's packaging into account + which caused installations from packages to behave different from + installs from source. + + This patch fixes the symlink to respect a possible `DESTDIR`. + + Closes #3266. + 8.1.0-dev.456 | 2025-08-25 12:29:32 -0700 * Bump zeekctl (Arne Welzel, Corelight) diff --git a/VERSION b/VERSION index 161e9fa5f0..645fbb022e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.1.0-dev.456 +8.1.0-dev.459 diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index f3c12302e4..9d2e26883c 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -14,7 +14,7 @@ install( CODE "execute_process( \ COMMAND ${CMAKE_COMMAND} -E create_symlink \ ${ZEEK_CONFIG_BTEST_TOOLS_DIR}/data \ - ${CMAKE_INSTALL_PREFIX}/share/zeek/tests \ + \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/zeek/tests \ )") install(DIRECTORY scripts/spicy/ DESTINATION ${ZEEK_CONFIG_BTEST_TOOLS_DIR}/data/Scripts