[#3731] Fix locations of lockfile dir, kea-admin, kea-lfc in case of installation

diff --git a/fuzz/meson.build b/fuzz/meson.build
index 1af2b17d99e3622f35ba861227b5827294c40518..e0d59238d78700c937e037e9f75a2727b4e68c1d 100644 (file)
--- a/fuzz/meson.build
+++ b/fuzz/meson.build
@@ -6,8 +6,8 @@ subdir('tests')
 
 fuzz_sources = ['fuzz.cc', 'fuzz.h']
 cpp_flags = [
-    f'-DKEA_LFC_SOURCES="@KEA_LFC@"',
     f'-DKEA_LFC_INSTALLATION="@PREFIX@/sbin/kea-lfc"',
+    f'-DKEA_LFC_SOURCES="@TOP_BUILD_DIR@/src/bin/lfc/kea-lfc"',
 ]
 if FUZZING_WITH_CLUSTERFUZZLITE
     cpp_flags = ['-fsanitize=fuzzer', '-gdwarf-4']

diff --git a/meson.build b/meson.build
index c4ebd7193381f97afec56be4ec9e89b96a69e827..26a4df1778df3a4cca63de3c5c738c95ff5a65aa 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -45,13 +45,11 @@ PREFIX = get_option('prefix')
 SBINDIR = get_option('sbindir')
 SYSCONFDIR = get_option('sysconfdir')
 
-DHCP_DATA_DIR = f'@LOCALSTATEDIR@/run/kea'
-DEFAULT_HOOKS_PATH = f'@PREFIX@/lib/kea/hooks'
-KEA_ADMIN = f'@TOP_BUILD_DIR@/src/bin/admin/kea-admin'
-KEA_LFC = f'@TOP_BUILD_DIR@/src/bin/lfc/kea-lfc'
-TEST_CA_DIR = f'@TOP_SOURCE_DIR@/src/lib/asiolink/testutils/ca'
-DATABASE_SCRIPTS_DIR = f'@TOP_BUILD_DIR@/src/share/database/scripts'
-LEGAL_LOG_DIR = f'@PREFIX@/@LOCALSTATEDIR@/lib/kea'
+DHCP_DATA_DIR = LOCALSTATEDIR / 'run/kea'
+DEFAULT_HOOKS_PATH = PREFIX / 'lib/kea/hooks'
+TEST_CA_DIR = TOP_SOURCE_DIR / 'src/lib/asiolink/testutils/ca'
+DATABASE_SCRIPTS_DIR = TOP_BUILD_DIR / 'src/share/database/scripts'
+LEGAL_LOG_DIR = PREFIX / LOCALSTATEDIR / 'lib/kea'
 
 #### Build Options
 

diff --git a/src/bin/dhcp4/tests/meson.build b/src/bin/dhcp4/tests/meson.build
index 7cd0fe58fa94217b42fa2533a80b2d6a604f5c66..6a0d33c1492d08074c66c21765f46adf4ebc827d 100644 (file)
--- a/src/bin/dhcp4/tests/meson.build
+++ b/src/bin/dhcp4/tests/meson.build
@@ -138,7 +138,7 @@ kea_dhcp4_tests = executable(
         f'-DCFG_EXAMPLES="@TOP_SOURCE_DIR@/doc/examples/kea4"',
         f'-DDHCP_DATA_DIR="@current_build_dir@"',
         f'-DSYNTAX_FILE="@current_source_dir@/../dhcp4_parser.yy"',
-        f'-DKEA_LFC_EXECUTABLE="@KEA_LFC@"',
+        f'-DKEA_LFC_EXECUTABLE="@TOP_BUILD_DIR@/src/bin/lfc/kea-lfc"',
         f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
     ],
     dependencies: dhcp4_tests_deps,

diff --git a/src/bin/dhcp6/tests/meson.build b/src/bin/dhcp6/tests/meson.build
index 1051503321fdc8adcb1a98af41f54274a300933f..ccc69ce498cffc06da91cf587b10e403a06c1150 100644 (file)
--- a/src/bin/dhcp6/tests/meson.build
+++ b/src/bin/dhcp6/tests/meson.build
@@ -140,7 +140,7 @@ kea_dhcp6_tests = executable(
         f'-DCFG_EXAMPLES="@TOP_SOURCE_DIR@/doc/examples/kea6"',
         f'-DDHCP_DATA_DIR="@current_build_dir@"',
         f'-DSYNTAX_FILE="@current_source_dir@/../dhcp6_parser.yy"',
-        f'-DKEA_LFC_EXECUTABLE="@KEA_LFC@"',
+        f'-DKEA_LFC_EXECUTABLE="@TOP_BUILD_DIR@/src/bin/lfc/kea-lfc"',
         f'-DTEST_CA_DIR="@TEST_CA_DIR@"',
     ],
     dependencies: dhcp6_tests_deps,

diff --git a/src/lib/dhcpsrv/meson.build b/src/lib/dhcpsrv/meson.build
index 7905afcfa5918312193d771fff13219e0c4d897f..38b4f2a3f3c8b5108e282c235021882be4726fc6 100644 (file)
--- a/src/lib/dhcpsrv/meson.build
+++ b/src/lib/dhcpsrv/meson.build
@@ -93,7 +93,7 @@ kea_dhcpsrv_lib = shared_library(
     sources,
     cpp_args: [
         f'-DDHCP_DATA_DIR="@DHCP_DATA_DIR@"',
-        f'-DKEA_LFC_EXECUTABLE="@KEA_LFC@"',
+        f'-DKEA_LFC_EXECUTABLE="@PREFIX@/@SBINDIR@/kea-lfc"',
     ],
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,

diff --git a/src/lib/log/interprocess/meson.build b/src/lib/log/interprocess/meson.build
index 48070da3bc709a6f6021a630d9062b04afc64f43..f4232d68f275bad09977650137bf4938919b8a01 100644 (file)
--- a/src/lib/log/interprocess/meson.build
+++ b/src/lib/log/interprocess/meson.build
@@ -2,7 +2,7 @@ kea_log_interprocess_lib = shared_library(
     'kea-log-interprocess',
     'interprocess_sync_file.cc',
     'interprocess_sync_null.cc',
-    cpp_args: [f'-DLOCKFILE_DIR="@LOCALSTATEDIR@/run/kea"'],
+    cpp_args: [f'-DLOCKFILE_DIR="@PREFIX@/@LOCALSTATEDIR@/run/kea"'],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: LIBDIR,

diff --git a/src/lib/mysql/meson.build b/src/lib/mysql/meson.build
index 9d416ce8c9769b70b4737d894e3ef04eb5e72197..c750222ac9cd474731b5410f8f8dfaafa668a0bc 100644 (file)
--- a/src/lib/mysql/meson.build
+++ b/src/lib/mysql/meson.build
@@ -6,7 +6,7 @@ kea_mysql_lib = shared_library(
     'kea-mysql',
     'mysql_binding.cc',
     'mysql_connection.cc',
-    cpp_args: [f'-DKEA_ADMIN="@KEA_ADMIN@"'],
+    cpp_args: [f'-DKEA_ADMIN="@PREFIX@/@SBINDIR@/kea-admin"'],
     dependencies: [MYSQL_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,

diff --git a/src/lib/mysql/tests/meson.build b/src/lib/mysql/tests/meson.build
index 83b6784cb643e56dd5a9b62d90776b3ad58d1d6d..af565bbec611e42d6a3cd527d072b93cdec7e6b8 100644 (file)
--- a/src/lib/mysql/tests/meson.build
+++ b/src/lib/mysql/tests/meson.build
@@ -12,7 +12,7 @@ kea_mysql_tests = executable(
     'mysql_binding_unittest.cc',
     'mysql_connection_unittest.cc',
     'run_unittests.cc',
-    cpp_args: [f'-DTEST_CA_DIR="@TEST_CA_DIR@"', f'-DKEA_ADMIN="@KEA_ADMIN@"'],
+    cpp_args: [f'-DTEST_CA_DIR="@TEST_CA_DIR@"', f'-DKEA_ADMIN="@TOP_BUILD_DIR@/src/bin/admin/kea-admin"'],
     dependencies: [GTEST_DEP, MYSQL_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib, libs_testutils] + LIBS_BUILT_SO_FAR,

diff --git a/src/lib/pgsql/meson.build b/src/lib/pgsql/meson.build
index 957c03ed11b5d048cf39583ee1ff5d569cdfd1b2..41de5ce4d0a24cc73b867fe652d7eac4b2cc1f39 100644 (file)
--- a/src/lib/pgsql/meson.build
+++ b/src/lib/pgsql/meson.build
@@ -6,7 +6,7 @@ kea_pgsql_lib = shared_library(
     'kea-pgsql',
     'pgsql_connection.cc',
     'pgsql_exchange.cc',
-    cpp_args: [f'-DKEA_ADMIN="@KEA_ADMIN@"'],
+    cpp_args: [f'-DKEA_ADMIN="@PREFIX@/@SBINDIR@/kea-admin"'],
     dependencies: [POSTGRESQL_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,

diff --git a/src/lib/pgsql/tests/meson.build b/src/lib/pgsql/tests/meson.build
index d4350b5f4a0c10ea9113c55ea70ea8966093dbe5..c4845e76d69eaadf89525d930e2bccaa6671328b 100644 (file)
--- a/src/lib/pgsql/tests/meson.build
+++ b/src/lib/pgsql/tests/meson.build
@@ -13,7 +13,7 @@ kea_pgsql_tests = executable(
     'pgsql_connection_unittest.cc',
     'pgsql_exchange_unittest.cc',
     'run_unittests.cc',
-    cpp_args: [f'-DTEST_CA_DIR="@TEST_CA_DIR@"', f'-DKEA_ADMIN="@KEA_ADMIN@"'],
+    cpp_args: [f'-DTEST_CA_DIR="@TEST_CA_DIR@"', f'-DKEA_ADMIN="@TOP_BUILD_DIR@/src/bin/admin/kea-admin"'],
     dependencies: [GTEST_DEP, POSTGRESQL_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib, libs_testutils] + LIBS_BUILT_SO_FAR,

diff --git a/src/lib/process/meson.build b/src/lib/process/meson.build
index 1420a6d5bb75a32542c885403378a1c29312621d..e1e029522bbc637b00911911dc0dd2ff7d40b131 100644 (file)
--- a/src/lib/process/meson.build
+++ b/src/lib/process/meson.build
@@ -12,7 +12,7 @@ kea_process_lib = shared_library(
     'log_parser.cc',
     'process_messages.cc',
     'redact_config.cc',
-    cpp_args: [f'-DPIDFILE_DIR="@LOCALSTATEDIR@/run/kea"'],
+    cpp_args: [f'-DPIDFILE_DIR="@PREFIX@/@LOCALSTATEDIR@/run/kea"'],
     dependencies: [GTEST_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,

diff --git a/src/lib/process/tests/meson.build b/src/lib/process/tests/meson.build
index 40ff589d586bba9b5316d606eab87fb84a68cd7b..af4a206d7532040c7b1658995ff011874a4c04db 100644 (file)
--- a/src/lib/process/tests/meson.build
+++ b/src/lib/process/tests/meson.build
@@ -25,7 +25,7 @@ kea_process_tests = executable(
     cpp_args: [
         f'-DTEST_DATA_BUILDDIR="@current_build_dir@"',
         f'-DTEST_SCRIPT_SH="@current_build_dir@/process_test.sh"',
-        f'-DPIDFILE_DIR="@LOCALSTATEDIR@/run/kea"',
+        f'-DPIDFILE_DIR="@PREFIX@/@LOCALSTATEDIR@/run/kea"',
     ],
     include_directories: [include_directories('.')] + INCLUDES,
     link_with: [kea_util_unittests_lib, libs_testutils] + LIBS_BUILT_SO_FAR,