[#3729] Finished variable cleanup

diff --git a/meson.build b/meson.build
index da4e9bf37b2a584d34e9768e0eb83e8c25bb830c..0d6b92fb3db23e81b834a46c002ebf6e5ea04f83 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -20,6 +20,7 @@ TOP_BUILD_DIR = meson.current_build_dir()
 TOP_SOURCE_DIR = meson.current_source_dir()
 RUN_STATE_DIR = get_option('localstatedir')
 PREFIX = get_option('prefix')
+DATADIR = get_option('datadir')
 SYSCONFDIR = get_option('sysconfdir')
 
 DHCP_DATA_DIR = f'@PREFIX@/@RUN_STATE_DIR@/run/kea'
@@ -28,6 +29,7 @@ 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@/@RUN_STATE_DIR@/lib/kea'
 
 # TODO: Control it via a build option.
 FUZZING_IN_CI = false

diff --git a/src/bin/keactrl/meson.build b/src/bin/keactrl/meson.build
index 2a61f6214741b937f3962048a7b4e8b3570f75ab..e47c24aff7ea6247b0e0c0825e550f4b516bcaf2 100644 (file)
--- a/src/bin/keactrl/meson.build
+++ b/src/bin/keactrl/meson.build
@@ -1,7 +1,6 @@
 keactrl_conf_data = configuration_data()
 keactrl_conf_data.set('prefix', PREFIX)
-sysconfdir = get_option('sysconfdir')
-keactrl_conf_data.set('sysconfdir', '${prefix}/' + sysconfdir)
+keactrl_conf_data.set('sysconfdir', '${prefix}/' + SYSCONFDIR)
 keactrl_conf_data.set('PACKAGE', 'kea')
 keactrl_conf_data.set('exec_prefix', '${prefix}')
 keactrl_conf_data.set('sbindir', '${prefix}/' + get_option('sbindir'))
@@ -14,7 +13,7 @@ keactrl_conf_data.set('EXTENDED_VERSION', project_version + ' (tarball)')
 keactrl_conf_data.set('PACKAGE_VERSION', project_version)
 keactrl_conf_data.set('runstatedir', '${prefix}/' + RUN_STATE_DIR + '/run')
 keactrl_conf_data.set('localstatedir', '${prefix}/' + RUN_STATE_DIR)
-kea_configfiles_destdir = f'@sysconfdir@/kea'
+kea_configfiles_destdir = f'@SYSCONFDIR@/kea'
 configure_file(
     input: 'keactrl.conf.in',
     output: 'keactrl.conf',

diff --git a/src/hooks/dhcp/bootp/libloadtests/meson.build b/src/hooks/dhcp/bootp/libloadtests/meson.build
index b7bef81b1d3acdde6b012a5b071431d2bba65780..2216ac7c246021289740740ec654d828f858d076 100644 (file)
--- a/src/hooks/dhcp/bootp/libloadtests/meson.build
+++ b/src/hooks/dhcp/bootp/libloadtests/meson.build
@@ -2,7 +2,6 @@ if not gtest.found()
     subdir_done()
 endif
 
-HOOK_INCLUDES = [include_directories('..')]
 dhcp_bootp_libload_tests = executable(
     'dhcp-bootp-libload-tests',
     'load_unload_unittests.cc',
@@ -11,7 +10,7 @@ dhcp_bootp_libload_tests = executable(
         f'-DLIBDHCP_BOOTP_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/bootp/libdhcp_bootp.so"',
     ],
     dependencies: [gtest, crypto],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
 test('dhcp_bootp_libload_tests', dhcp_bootp_libload_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/bootp/tests/meson.build b/src/hooks/dhcp/bootp/tests/meson.build
index b1f8be6f338476c74ae579cfc2f0e59d83b18ea8..ea889a04ea9aacdc3be90820c1f1af6dc1a17bcd 100644 (file)
--- a/src/hooks/dhcp/bootp/tests/meson.build
+++ b/src/hooks/dhcp/bootp/tests/meson.build
@@ -2,7 +2,6 @@ if not gtest.found()
     subdir_done()
 endif
 
-HOOK_INCLUDES = [include_directories('..')]
 dhcp_bootp_lib_tests = executable(
     'dhcp-bootp-lib-tests',
     'bootp_unittests.cc',
@@ -11,7 +10,7 @@ dhcp_bootp_lib_tests = executable(
         f'-DBOOTP_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/bootp/libdhcp_bootp.so"',
     ],
     dependencies: [gtest],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_bootp_archive] + LIBS_BUILT_SO_FAR,
 )
 test('dhcp_bootp_lib_tests', dhcp_bootp_lib_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/flex_option/libloadtests/meson.build b/src/hooks/dhcp/flex_option/libloadtests/meson.build
index 7bc401ffe13e8245bc61045e0837b9cbdf4ee19a..ce8f8887839ab525b3b4386ec566d279533c897c 100644 (file)
--- a/src/hooks/dhcp/flex_option/libloadtests/meson.build
+++ b/src/hooks/dhcp/flex_option/libloadtests/meson.build
@@ -2,7 +2,6 @@ if not gtest.found()
     subdir_done()
 endif
 
-HOOK_INCLUDES = [include_directories('..')]
 dhcp_flex_option_libload_tests = executable(
     'dhcp-flex-option-libload-tests',
     'callout_unittests.cc',
@@ -12,7 +11,7 @@ dhcp_flex_option_libload_tests = executable(
         f'-DFLEX_OPTION_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/flex_option/libdhcp_flex_option.so"',
     ],
     dependencies: [gtest, crypto],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(

diff --git a/src/hooks/dhcp/flex_option/tests/meson.build b/src/hooks/dhcp/flex_option/tests/meson.build
index a3d297eed2f2f60566171b31d93dfd23b7f1ce65..f3432fccc03667feaeb798987d23e06f122ad29a 100644 (file)
--- a/src/hooks/dhcp/flex_option/tests/meson.build
+++ b/src/hooks/dhcp/flex_option/tests/meson.build
@@ -2,7 +2,6 @@ if not gtest.found()
     subdir_done()
 endif
 
-HOOK_INCLUDES = [include_directories('..')]
 dhcp_flex_option_lib_tests = executable(
     'dhcp-flex-option-lib-tests',
     'flex_option_unittests.cc',
@@ -12,7 +11,7 @@ dhcp_flex_option_lib_tests = executable(
         f'-DFLEX_OPTION_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/flex_option/libdhcp_flex_option.so"',
     ],
     dependencies: [gtest, crypto],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_flex_option_archive] + LIBS_BUILT_SO_FAR,
 )
 test('dhcp_flex_option_lib_tests', dhcp_flex_option_lib_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/high_availability/libloadtests/meson.build b/src/hooks/dhcp/high_availability/libloadtests/meson.build
index 5407f08d07ed688c54631bf42ae55d58d46227bb..99fbfaf553365797c91034ff29074cdee5d6c303 100644 (file)
--- a/src/hooks/dhcp/high_availability/libloadtests/meson.build
+++ b/src/hooks/dhcp/high_availability/libloadtests/meson.build
@@ -2,7 +2,6 @@ if not gtest.found()
     subdir_done()
 endif
 
-HOOK_INCLUDES = [include_directories('..')]
 dhcp_ha_libload_tests = executable(
     'dhcp-ha-libload-tests',
     'close_unittests.cc',
@@ -12,7 +11,7 @@ dhcp_ha_libload_tests = executable(
         f'-DLIBDHCP_HA_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/high_availability/libdhcp_ha.so"',
     ],
     dependencies: [gtest, crypto],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
 test('dhcp_ha_libload_tests', dhcp_ha_libload_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/high_availability/tests/meson.build b/src/hooks/dhcp/high_availability/tests/meson.build
index 03e598b56a6423ba31edc38e8cd4963c0aa10abd..7eadebd0a9b4ba273d6de9a1a5a1ae0fdda34a8b 100644 (file)
--- a/src/hooks/dhcp/high_availability/tests/meson.build
+++ b/src/hooks/dhcp/high_availability/tests/meson.build
@@ -2,7 +2,6 @@ if not gtest.found()
     subdir_done()
 endif
 
-HOOK_INCLUDES = [include_directories('..')]
 dhcp_ha_lib_tests = executable(
     'dhcp-ha-lib-tests',
     'command_creator_unittest.cc',
@@ -23,7 +22,7 @@ dhcp_ha_lib_tests = executable(
         f'-DTEST_HTTP_DIR="@TOP_SOURCE_DIR@/src/lib/http/tests/testdata"',
     ],
     dependencies: [gtest, crypto],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_ha_archive] + [kea_testutils_lib] + LIBS_BUILT_SO_FAR,
 )
 test(

diff --git a/src/hooks/dhcp/lease_cmds/libloadtests/meson.build b/src/hooks/dhcp/lease_cmds/libloadtests/meson.build
index 8b85851091a7a502d3638ea9bb2e2ef87bf6f607..270d772e18b81981aab6ebb10ffe3f02ae27ceda 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/libloadtests/meson.build
+++ b/src/hooks/dhcp/lease_cmds/libloadtests/meson.build
@@ -2,7 +2,6 @@ if not gtest.found()
     subdir_done()
 endif
 
-HOOK_INCLUDES = [include_directories('..')]
 dhcp_lease_cmds_libload_tests = executable(
     'dhcp-lease-cmds-libload-tests',
     'load_unload_unittests.cc',
@@ -11,7 +10,7 @@ dhcp_lease_cmds_libload_tests = executable(
         f'-DLIBDHCP_LEASE_CMDS_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/lease_cmds/libdhcp_lease_cmds.so"',
     ],
     dependencies: [gtest, crypto],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(

diff --git a/src/hooks/dhcp/lease_cmds/tests/meson.build b/src/hooks/dhcp/lease_cmds/tests/meson.build
index 8e82d68b34c1652ee0256927d7b19c4c51be21bc..cc0a7dff54d3d94a51c15193b6d9006bede17451 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/tests/meson.build
+++ b/src/hooks/dhcp/lease_cmds/tests/meson.build
@@ -2,7 +2,6 @@ if not gtest.found()
     subdir_done()
 endif
 
-HOOK_INCLUDES = [include_directories('..')]
 dhcp_lease_cmds_lib_tests = executable(
     'dhcp-lease-cmds-lib-tests',
     'lease_cmds4_unittest.cc',
@@ -13,7 +12,7 @@ dhcp_lease_cmds_lib_tests = executable(
         f'-DLEASE_CMDS_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/lease_cmds/libdhcp_lease_cmds.so"',
     ],
     dependencies: [gtest, crypto],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_lease_cmds_archive] + LIBS_BUILT_SO_FAR,
 )
 test('dhcp_lease_cmds_lib_tests', dhcp_lease_cmds_lib_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/mysql/libloadtests/meson.build b/src/hooks/dhcp/mysql/libloadtests/meson.build
index ce7ae11a5a7bab3e0fb4700295b07a422f485710..dbddb3828d7eb6a1517c6997ea7077475d5491e3 100644 (file)
--- a/src/hooks/dhcp/mysql/libloadtests/meson.build
+++ b/src/hooks/dhcp/mysql/libloadtests/meson.build
@@ -2,7 +2,6 @@ if not gtest.found()
     subdir_done()
 endif
 
-HOOK_INCLUDES = [include_directories('..')]
 dhcp_mysql_libload_tests = executable(
     'dhcp-mysql-libload-tests',
     'load_unload_unittests.cc',
@@ -11,7 +10,7 @@ dhcp_mysql_libload_tests = executable(
         f'-DLIBDHCP_MYSQL_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/mysql/libdhcp_mysql.so"',
     ],
     dependencies: [gtest, crypto],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
 test('dhcp_mysql_libload_tests', dhcp_mysql_libload_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/mysql/tests/meson.build b/src/hooks/dhcp/mysql/tests/meson.build
index b0847302b9a2d44ba89e983c8fa98326984665bf..7c323617208bf39b8314be1db6b1ac9fc00e5399 100644 (file)
--- a/src/hooks/dhcp/mysql/tests/meson.build
+++ b/src/hooks/dhcp/mysql/tests/meson.build
@@ -2,7 +2,6 @@ if not gtest.found()
     subdir_done()
 endif
 
-HOOK_INCLUDES = [include_directories('..')]
 libs_testutils = [
     kea_dhcpsrv_testutils_lib,
     kea_mysql_testutils_lib,
@@ -21,7 +20,7 @@ dhcp_mysql_lib_tests = executable(
     'mysql_lease_mgr_unittest.cc',
     'run_unittests.cc',
     dependencies: [gtest, crypto, mysql],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_mysql_archive] + libs_testutils + LIBS_BUILT_SO_FAR,
 )
 test(

diff --git a/src/hooks/dhcp/perfmon/libloadtests/meson.build b/src/hooks/dhcp/perfmon/libloadtests/meson.build
index 70c60332e1a902bff6739a2fded6efe666a7bef4..f20c7146f38dcf277ebda04992df7ab25de668c9 100644 (file)
--- a/src/hooks/dhcp/perfmon/libloadtests/meson.build
+++ b/src/hooks/dhcp/perfmon/libloadtests/meson.build
@@ -2,7 +2,6 @@ if not gtest.found()
     subdir_done()
 endif
 
-HOOK_INCLUDES = [include_directories('..')]
 dhcp_perfmon_libload_tests = executable(
     'dhcp-perfmon-libload-tests',
     'load_unload_unittests.cc',
@@ -11,7 +10,7 @@ dhcp_perfmon_libload_tests = executable(
         f'-DLIBDHCP_PERFMON_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/perfmon/libdhcp_perfmon.so"',
     ],
     dependencies: [gtest, crypto],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
 test('dhcp_perfmon_libload_tests', dhcp_perfmon_libload_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/perfmon/tests/meson.build b/src/hooks/dhcp/perfmon/tests/meson.build
index 4b89583dd185701ecfe2205361ddd65370478a90..3f767f1947ce9fe4d08a97744fb5f31a1bf1a2ee 100644 (file)
--- a/src/hooks/dhcp/perfmon/tests/meson.build
+++ b/src/hooks/dhcp/perfmon/tests/meson.build
@@ -2,7 +2,6 @@ if not gtest.found()
     subdir_done()
 endif
 
-HOOK_INCLUDES = [include_directories('..')]
 dhcp_perfmon_lib_tests = executable(
     'dhcp-perfmon-lib-tests',
     'alarm_parser_unittests.cc',
@@ -17,7 +16,7 @@ dhcp_perfmon_lib_tests = executable(
         f'-DPERFMON_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/perfmon/libdhcp_perfmon.so"',
     ],
     dependencies: [gtest, crypto],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_perfmon_archive] + [kea_testutils_lib] + LIBS_BUILT_SO_FAR,
 )
 test('dhcp_perfmon_lib_tests', dhcp_perfmon_lib_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/pgsql/libloadtests/meson.build b/src/hooks/dhcp/pgsql/libloadtests/meson.build
index 060bbe3eae2d3ed99b6b9c5ec5cffe5368f6e5ad..67f9bf85819622f26a687dbe34c3926ffe280b22 100644 (file)
--- a/src/hooks/dhcp/pgsql/libloadtests/meson.build
+++ b/src/hooks/dhcp/pgsql/libloadtests/meson.build
@@ -2,7 +2,6 @@ if not gtest.found()
     subdir_done()
 endif
 
-HOOK_INCLUDES = [include_directories('..')]
 dhcp_pgsql_libload_tests = executable(
     'dhcp-pgsql-libload-tests',
     'load_unload_unittests.cc',
@@ -11,7 +10,7 @@ dhcp_pgsql_libload_tests = executable(
         f'-DLIBDHCP_PGSQL_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/pgsql/libdhcp_pgsql.so"',
     ],
     dependencies: [gtest, crypto],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
 test('dhcp_pgsql_libload_tests', dhcp_pgsql_libload_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/pgsql/tests/meson.build b/src/hooks/dhcp/pgsql/tests/meson.build
index b5e639b9c37985f6c4a90e18131716b4d7dec363..9e6f6fa71622c9c99b10272800061b66e6a57540 100644 (file)
--- a/src/hooks/dhcp/pgsql/tests/meson.build
+++ b/src/hooks/dhcp/pgsql/tests/meson.build
@@ -2,7 +2,6 @@ if not gtest.found()
     subdir_done()
 endif
 
-HOOK_INCLUDES = [include_directories('..')]
 libs_testutils = [
     kea_dhcpsrv_testutils_lib,
     kea_pgsql_testutils_lib,
@@ -21,7 +20,7 @@ dhcp_pgsql_lib_tests = executable(
     'pgsql_lease_mgr_unittest.cc',
     'run_unittests.cc',
     dependencies: [gtest, crypto, postgresql],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_pgsql_archive] + libs_testutils + LIBS_BUILT_SO_FAR,
 )
 test(

diff --git a/src/hooks/dhcp/run_script/libloadtests/meson.build b/src/hooks/dhcp/run_script/libloadtests/meson.build
index e4061e72a14675079cc74cc3f05c09d278cd2040..571eb617cfe96246903be76eb843f376c7bbeb03 100644 (file)
--- a/src/hooks/dhcp/run_script/libloadtests/meson.build
+++ b/src/hooks/dhcp/run_script/libloadtests/meson.build
@@ -1,8 +1,7 @@
 if not gtest.found()
     subdir_done()
 endif
-
-HOOK_INCLUDES = [include_directories('..')]
+hook_includes = [include_directories('..')]
 dhcp_run_script_libload_tests = executable(
     'dhcp-run-script-libload-tests',
     'load_unload_unittests.cc',
@@ -12,7 +11,7 @@ dhcp_run_script_libload_tests = executable(
         f'-DRUN_SCRIPT_TEST_SH="@TOP_BUILD_DIR@/src/hooks/dhcp/run_script/tests/run_script_test.sh"',
     ],
     dependencies: [gtest, crypto],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(

diff --git a/src/hooks/dhcp/run_script/tests/meson.build b/src/hooks/dhcp/run_script/tests/meson.build
index 29dad7d5fa7524cfcf35ac46ddab42441784a65a..488e996c6cc5840dd66c09074135cd99ce4057f7 100644 (file)
--- a/src/hooks/dhcp/run_script/tests/meson.build
+++ b/src/hooks/dhcp/run_script/tests/meson.build
@@ -11,7 +11,6 @@ configure_file(
 )
 
 current_build_dir = meson.current_build_dir()
-hook_includes = [include_directories('..')]
 dhcp_run_script_lib_tests = executable(
     'dhcp-run-script-lib-tests',
     'run_script_unittests.cc',
@@ -19,10 +18,10 @@ dhcp_run_script_lib_tests = executable(
     cpp_args: [
         f'-DRUN_SCRIPT_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/run_script/libdhcp_run_script.so"',
         f'-DTEST_LOG_FILE="@current_build_dir@/test.log"',
-        f'-DRUN_SCRIPT_TEST_SH="@CURRENT_BUILD_DIR@/run_script_test.sh"',
+        f'-DRUN_SCRIPT_TEST_SH="@current_build_dir@/run_script_test.sh"',
     ],
     dependencies: [gtest, crypto],
-    include_directories: [include_directories('.')] + INCLUDES + hook_includes,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_run_script_archive] + LIBS_BUILT_SO_FAR,
 )
 test('dhcp_run_script_lib_tests', dhcp_run_script_lib_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/stat_cmds/libloadtests/meson.build b/src/hooks/dhcp/stat_cmds/libloadtests/meson.build
index 9f3b282217081e7d6e674d8f2d525fa8097c4a76..8a46ac6388bd395115027fdeb3fe6514b232ccba 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/libloadtests/meson.build
+++ b/src/hooks/dhcp/stat_cmds/libloadtests/meson.build
@@ -2,7 +2,6 @@ if not gtest.found()
     subdir_done()
 endif
 
-HOOK_INCLUDES = [include_directories('..')]
 dhcp_stat_cmds_libload_tests = executable(
     'dhcp-stat-cmds-libload-tests',
     'load_unload_unittests.cc',
@@ -11,7 +10,7 @@ dhcp_stat_cmds_libload_tests = executable(
         f'-DLIBDHCP_STAT_CMDS_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/stat_cmds/libdhcp_stat_cmds.so"',
     ],
     dependencies: [gtest, crypto],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: LIBS_BUILT_SO_FAR,
 )
 test(

diff --git a/src/hooks/dhcp/stat_cmds/tests/meson.build b/src/hooks/dhcp/stat_cmds/tests/meson.build
index 546471d7f87e64877a6bd7e06cce1db8a2cd7a7b..e5225dc191a7380f51d346e37ab98b0be44cc175 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/tests/meson.build
+++ b/src/hooks/dhcp/stat_cmds/tests/meson.build
@@ -2,7 +2,6 @@ if not gtest.found()
     subdir_done()
 endif
 
-HOOK_INCLUDES = [include_directories('..')]
 dhcp_stat_cmds_lib_tests = executable(
     'dhcp-stat-cmds-lib-tests',
     'run_unittests.cc',
@@ -11,7 +10,7 @@ dhcp_stat_cmds_lib_tests = executable(
         f'-DSTAT_CMDS_LIB_SO="@TOP_BUILD_DIR@/src/hooks/dhcp/stat_cmds/libdhcp_stat_cmds.so"',
     ],
     dependencies: [gtest, crypto],
-    include_directories: [include_directories('.')] + INCLUDES + HOOK_INCLUDES,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_stat_cmds_archive] + LIBS_BUILT_SO_FAR,
 )
 test('dhcp_stat_cmds_lib_tests', dhcp_stat_cmds_lib_tests, protocol: 'gtest')

diff --git a/src/hooks/dhcp/user_chk/tests/meson.build b/src/hooks/dhcp/user_chk/tests/meson.build
index ffef2fd9fc08796ca4b159eba07c253ea4988941..0ea903e2bacead0754e12310fe29aeb5d4a42dbc 100644 (file)
--- a/src/hooks/dhcp/user_chk/tests/meson.build
+++ b/src/hooks/dhcp/user_chk/tests/meson.build
@@ -10,7 +10,6 @@ configure_file(
     configuration: dhcp_user_chk_config_data,
 )
 
-hook_includes = [include_directories('..')]
 current_build_dir = meson.current_build_dir()
 dhcp_user_chk_lib_tests = executable(
     'dhcp-user-chk-lib-tests',
@@ -21,7 +20,7 @@ dhcp_user_chk_lib_tests = executable(
     'userid_unittests.cc',
     cpp_args: [f'-DTEST_DATA_BUILDDIR="@current_source_dir@"'],
     dependencies: [gtest],
-    include_directories: [include_directories('.')] + INCLUDES + hook_includes,
+    include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     link_with: [dhcp_user_chk_archive] + LIBS_BUILT_SO_FAR,
 )
 test('dhcp_user_chk_lib_tests', dhcp_user_chk_lib_tests, protocol: 'gtest')

diff --git a/src/share/api/meson.build b/src/share/api/meson.build
index 6d367b1033c08da382f14463c85ce89a9d55a424..e593ef5d1629a629327aae14c89c55edce4e23c2 100644 (file)
--- a/src/share/api/meson.build
+++ b/src/share/api/meson.build
@@ -1,5 +1,4 @@
 list = run_command('grabber.sh', check: true)
 api_files = list.stdout().strip().split('\n')
-DATADIR = get_option('datadir')
-INSTALL_DIR = f'@DATADIR@/kea/api'
-install_data(api_files, install_dir: INSTALL_DIR)
+install_dir = f'@DATADIR@/kea/api'
+install_data(api_files, install_dir: install_dir)

diff --git a/src/share/database/scripts/mysql/meson.build b/src/share/database/scripts/mysql/meson.build
index 4416f961813dcf1c316e9951aeb6aa9b981ba6f6..ab8821a81ee7d22b7bc2d3d7351b4d6b11d93a55 100644 (file)
--- a/src/share/database/scripts/mysql/meson.build
+++ b/src/share/database/scripts/mysql/meson.build
@@ -1,18 +1,17 @@
-DATADIR = get_option('datadir')
-INSTALL_DIR = f'@DATADIR@/kea/scripts/mysql'
+install_dir = f'@DATADIR@/kea/scripts/mysql'
 configure_file(
     input: 'dhcpdb_create.mysql',
     output: 'dhcpdb_create.mysql',
     copy: true,
     install: true,
-    install_dir: INSTALL_DIR,
+    install_dir: install_dir,
 )
 configure_file(
     input: 'dhcpdb_drop.mysql',
     output: 'dhcpdb_drop.mysql',
     copy: true,
     install: true,
-    install_dir: INSTALL_DIR,
+    install_dir: install_dir,
 )
 
 mysql_scripts_conf_data = configuration_data()
@@ -25,7 +24,7 @@ configure_file(
     output: 'wipe_data.sh',
     configuration: mysql_scripts_conf_data,
     install: true,
-    install_dir: INSTALL_DIR,
+    install_dir: install_dir,
 )
 upgrade_scripts = [
     'upgrade_001.0_to_002.0.sh',
@@ -79,6 +78,6 @@ foreach file : upgrade_scripts
         output: file,
         configuration: mysql_scripts_conf_data,
         install: true,
-        install_dir: INSTALL_DIR,
+        install_dir: install_dir,
     )
 endforeach

diff --git a/src/share/database/scripts/pgsql/meson.build b/src/share/database/scripts/pgsql/meson.build
index bec826705daa29aee0a7fb483108d621f4e9b9c4..0ebc33f31c0af3ed41c0e16fc173f0b13435ad64 100644 (file)
--- a/src/share/database/scripts/pgsql/meson.build
+++ b/src/share/database/scripts/pgsql/meson.build
@@ -1,18 +1,17 @@
-DATADIR = get_option('datadir')
-INSTALL_DIR = f'@DATADIR@/kea/scripts/pgsql'
+install_dir = f'@DATADIR@/kea/scripts/pgsql'
 configure_file(
     input: 'dhcpdb_create.pgsql',
     output: 'dhcpdb_create.pgsql',
     copy: true,
     install: true,
-    install_dir: INSTALL_DIR,
+    install_dir: install_dir,
 )
 configure_file(
     input: 'dhcpdb_drop.pgsql',
     output: 'dhcpdb_drop.pgsql',
     copy: true,
     install: true,
-    install_dir: INSTALL_DIR,
+    install_dir: install_dir,
 )
 
 pgsql_scripts_conf_data = configuration_data()
@@ -25,7 +24,7 @@ configure_file(
     output: 'wipe_data.sh',
     configuration: pgsql_scripts_conf_data,
     install: true,
-    install_dir: INSTALL_DIR,
+    install_dir: install_dir,
 )
 upgrade_scripts = [
     'upgrade_001.0_to_002.0.sh',
@@ -74,6 +73,6 @@ foreach file : upgrade_scripts
         output: file,
         configuration: pgsql_scripts_conf_data,
         install: true,
-        install_dir: INSTALL_DIR,
+        install_dir: install_dir,
     )
 endforeach