From 950cbdeca1821e4cfa24ac75516bd206097583aa Mon Sep 17 00:00:00 2001 From: Andrei Pavel Date: Wed, 26 Mar 2025 08:33:22 +0200 Subject: [PATCH] [#3732] Fix some paths in meson --- meson.build | 2 +- src/hooks/dhcp/forensic_log/meson.build | 2 +- src/hooks/dhcp/forensic_log/tests/meson.build | 2 +- src/lib/dhcpsrv/meson.build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index bcaf5d5ef1..558c42bd31 100644 --- a/meson.build +++ b/meson.build @@ -59,7 +59,7 @@ KEA_ADMIN_BUILT = TOP_BUILD_DIR / 'src/bin/admin/kea-admin' KEA_ADMIN_INSTALLED = PREFIX / SBINDIR / 'kea-admin' KEA_LFC_BUILT = TOP_BUILD_DIR / 'src/bin/lfc/kea-lfc' KEA_LFC_INSTALLED = PREFIX / SBINDIR / 'kea-lfc' -LEGAL_LOG_DIR = PREFIX / LOCALSTATEDIR / 'lib/kea' +SHAREDSTATEDIR_INSTALLED = PREFIX / LOCALSTATEDIR / 'lib/kea' RUNSTATEDIR = LOCALSTATEDIR / 'run/kea' RUNSTATEDIR_INSTALLED = PREFIX / RUNSTATEDIR TEST_CA_DIR = TOP_SOURCE_DIR / 'src/lib/asiolink/testutils/ca' diff --git a/src/hooks/dhcp/forensic_log/meson.build b/src/hooks/dhcp/forensic_log/meson.build index 6f50cc12ad..3aa60c84bc 100644 --- a/src/hooks/dhcp/forensic_log/meson.build +++ b/src/hooks/dhcp/forensic_log/meson.build @@ -9,7 +9,7 @@ dhcp_forensic_log_lib = shared_library( 'load_unload.cc', 'rotating_file.cc', 'version.cc', - cpp_args: [f'-DLEGAL_LOG_DIR="@LEGAL_LOG_DIR@"'], + cpp_args: [f'-DLEGAL_LOG_DIR="@SHAREDSTATEDIR_INSTALLED@"'], dependencies: [CRYPTO_DEP, MYSQL_DEP, POSTGRESQL_DEP], include_directories: [include_directories('.')] + INCLUDES, install: true, diff --git a/src/hooks/dhcp/forensic_log/tests/meson.build b/src/hooks/dhcp/forensic_log/tests/meson.build index 0964e21eda..b49bce20f8 100644 --- a/src/hooks/dhcp/forensic_log/tests/meson.build +++ b/src/hooks/dhcp/forensic_log/tests/meson.build @@ -42,7 +42,7 @@ dhcp_forensic_log_tests = executable( f'-DINVALID_FORENSIC_PREROTATE_TEST_SH="@TOP_SOURCE_DIR@/README"', f'-DFORENSIC_POSTROTATE_TEST_SH="@current_build_dir@/forensic_postrotate_test.sh"', f'-DINVALID_FORENSIC_POSTROTATE_TEST_SH="@TOP_SOURCE_DIR@/README"', - f'-DLEGAL_LOG_DIR="@LEGAL_LOG_DIR@"', + f'-DLEGAL_LOG_DIR="@SHAREDSTATEDIR_INSTALLED@"', ], dependencies: dependencies, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES, diff --git a/src/lib/dhcpsrv/meson.build b/src/lib/dhcpsrv/meson.build index 946cd7dc82..eaa3306969 100644 --- a/src/lib/dhcpsrv/meson.build +++ b/src/lib/dhcpsrv/meson.build @@ -92,7 +92,7 @@ kea_dhcpsrv_lib = shared_library( 'kea-dhcpsrv', sources, cpp_args: [ - f'-DDHCP_DATA_DIR="@RUNSTATEDIR_INSTALLED@"', + f'-DDHCP_DATA_DIR="@SHAREDSTATEDIR_INSTALLED@"', f'-DKEA_LFC_EXECUTABLE="@KEA_LFC_INSTALLED@"', ], dependencies: [CRYPTO_DEP],