From ccdbf25d1f8c4357cb7392f753ec035c5d5ec398 Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 21 Aug 2025 10:19:35 +0200 Subject: [PATCH] testing: Make share/zeek/tests a relative symlink, prefix with DESTDIR This create_symlink call would not respect DESTDIR at installation time, fix proposed by Benjamin. Also make the symlink path relative instead of absolute for easier relocation of the Zeek installation. Closes #3266 --- testing/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt index f3c12302e4..343d7e8f3d 100644 --- a/testing/CMakeLists.txt +++ b/testing/CMakeLists.txt @@ -13,8 +13,8 @@ endif () install( CODE "execute_process( \ COMMAND ${CMAKE_COMMAND} -E create_symlink \ - ${ZEEK_CONFIG_BTEST_TOOLS_DIR}/data \ - ${CMAKE_INSTALL_PREFIX}/share/zeek/tests \ + ../btest/data \ + \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/share/zeek/tests \ )") install(DIRECTORY scripts/spicy/ DESTINATION ${ZEEK_CONFIG_BTEST_TOOLS_DIR}/data/Scripts