2
0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-28 20:47:48 +00:00

[#3732] Fix some paths in meson

This commit is contained in:
Andrei Pavel 2025-03-26 08:33:22 +02:00
parent aaa4d42414
commit 950cbdeca1
No known key found for this signature in database
GPG Key ID: D4E804481939CB21
4 changed files with 4 additions and 4 deletions

View File

@ -59,7 +59,7 @@ KEA_ADMIN_BUILT = TOP_BUILD_DIR / 'src/bin/admin/kea-admin'
KEA_ADMIN_INSTALLED = PREFIX / SBINDIR / 'kea-admin' KEA_ADMIN_INSTALLED = PREFIX / SBINDIR / 'kea-admin'
KEA_LFC_BUILT = TOP_BUILD_DIR / 'src/bin/lfc/kea-lfc' KEA_LFC_BUILT = TOP_BUILD_DIR / 'src/bin/lfc/kea-lfc'
KEA_LFC_INSTALLED = PREFIX / SBINDIR / '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 = LOCALSTATEDIR / 'run/kea'
RUNSTATEDIR_INSTALLED = PREFIX / RUNSTATEDIR RUNSTATEDIR_INSTALLED = PREFIX / RUNSTATEDIR
TEST_CA_DIR = TOP_SOURCE_DIR / 'src/lib/asiolink/testutils/ca' TEST_CA_DIR = TOP_SOURCE_DIR / 'src/lib/asiolink/testutils/ca'

View File

@ -9,7 +9,7 @@ dhcp_forensic_log_lib = shared_library(
'load_unload.cc', 'load_unload.cc',
'rotating_file.cc', 'rotating_file.cc',
'version.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], dependencies: [CRYPTO_DEP, MYSQL_DEP, POSTGRESQL_DEP],
include_directories: [include_directories('.')] + INCLUDES, include_directories: [include_directories('.')] + INCLUDES,
install: true, install: true,

View File

@ -42,7 +42,7 @@ dhcp_forensic_log_tests = executable(
f'-DINVALID_FORENSIC_PREROTATE_TEST_SH="@TOP_SOURCE_DIR@/README"', f'-DINVALID_FORENSIC_PREROTATE_TEST_SH="@TOP_SOURCE_DIR@/README"',
f'-DFORENSIC_POSTROTATE_TEST_SH="@current_build_dir@/forensic_postrotate_test.sh"', f'-DFORENSIC_POSTROTATE_TEST_SH="@current_build_dir@/forensic_postrotate_test.sh"',
f'-DINVALID_FORENSIC_POSTROTATE_TEST_SH="@TOP_SOURCE_DIR@/README"', 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, dependencies: dependencies,
include_directories: [include_directories('.'), include_directories('..')] + INCLUDES, include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,

View File

@ -92,7 +92,7 @@ kea_dhcpsrv_lib = shared_library(
'kea-dhcpsrv', 'kea-dhcpsrv',
sources, sources,
cpp_args: [ cpp_args: [
f'-DDHCP_DATA_DIR="@RUNSTATEDIR_INSTALLED@"', f'-DDHCP_DATA_DIR="@SHAREDSTATEDIR_INSTALLED@"',
f'-DKEA_LFC_EXECUTABLE="@KEA_LFC_INSTALLED@"', f'-DKEA_LFC_EXECUTABLE="@KEA_LFC_INSTALLED@"',
], ],
dependencies: [CRYPTO_DEP], dependencies: [CRYPTO_DEP],