[#3731] Fix libdir in meson

diff --git a/meson.build b/meson.build
index d204416ce4c78ae2afe4e3b46d4943997d0737de..f8b40b4816a721b0793a3577e75ff555f95351d6 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -14,9 +14,11 @@ python_module = import('python')
 
 TOP_BUILD_DIR = meson.current_build_dir()
 TOP_SOURCE_DIR = meson.current_source_dir()
+
+DATADIR = get_option('datadir')
+LIBDIR = get_option('libdir')
 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'

diff --git a/src/hooks/d2/gss_tsig/meson.build b/src/hooks/d2/gss_tsig/meson.build
index 6a1932bb7477673d7ab5ac7475920cfec1ff00c9..84021c977967fc0e6e4e6d9020b5364cf76be50d 100644 (file)
--- a/src/hooks/d2/gss_tsig/meson.build
+++ b/src/hooks/d2/gss_tsig/meson.build
@@ -18,7 +18,7 @@ ddns_gss_tsig_lib = shared_library(
     dependencies: [KRB5_DEP, CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/bootp/meson.build b/src/hooks/dhcp/bootp/meson.build
index 186c936163f9b4dd75161c256cec45d1d26c39f5..2bf8abe7edcf6d658b3cd1d5c6cdfe81b7225abf 100644 (file)
--- a/src/hooks/dhcp/bootp/meson.build
+++ b/src/hooks/dhcp/bootp/meson.build
@@ -6,7 +6,7 @@ dhcp_bootp_lib = shared_library(
     'version.cc',
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/class_cmds/meson.build b/src/hooks/dhcp/class_cmds/meson.build
index 4a569934e1bbf7dff8ec873353390fa376fc9edf..f0b42ca19a388bcf20d625f41246e221cefdf535 100644 (file)
--- a/src/hooks/dhcp/class_cmds/meson.build
+++ b/src/hooks/dhcp/class_cmds/meson.build
@@ -8,7 +8,7 @@ dhcp_class_cmds_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/ddns_tuning/meson.build b/src/hooks/dhcp/ddns_tuning/meson.build
index e8e2a3f5a0de4dde42dc99334bab6f5b2dc6b9f3..4073c4b9c596369848d32df6b171b314f4972d0f 100644 (file)
--- a/src/hooks/dhcp/ddns_tuning/meson.build
+++ b/src/hooks/dhcp/ddns_tuning/meson.build
@@ -9,7 +9,7 @@ dhcp_ddns_tuning_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/flex_id/meson.build b/src/hooks/dhcp/flex_id/meson.build
index 95d38a8fe18da7b74fdf83993c548e1e91f25f68..02863f3dbf4dddaa3e004d2127ccb37212fcc4a8 100644 (file)
--- a/src/hooks/dhcp/flex_id/meson.build
+++ b/src/hooks/dhcp/flex_id/meson.build
@@ -8,7 +8,7 @@ dhcp_flex_id_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/flex_option/meson.build b/src/hooks/dhcp/flex_option/meson.build
index dc8c0d2665cf8fc5bfdadd66166fec47d772c310..e35181142eca73ea7705013dee2e032a8be12841 100644 (file)
--- a/src/hooks/dhcp/flex_option/meson.build
+++ b/src/hooks/dhcp/flex_option/meson.build
@@ -8,7 +8,7 @@ dhcp_flex_option_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/forensic_log/meson.build b/src/hooks/dhcp/forensic_log/meson.build
index 0f2693fa68741aa161972c11ad63679cbbb3b6e6..f5f13eaef3847aa930661b88c81be5b5bd9cc119 100644 (file)
--- a/src/hooks/dhcp/forensic_log/meson.build
+++ b/src/hooks/dhcp/forensic_log/meson.build
@@ -12,7 +12,7 @@ dhcp_forensic_log_lib = shared_library(
     dependencies: [CRYPTO_DEP, MYSQL_DEP, POSTGRESQL_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/high_availability/meson.build b/src/hooks/dhcp/high_availability/meson.build
index df0d5edd3741370c1c38b5a209c021fc893ea0d8..298d38d62f2cfad962ec7850742578e59796d1e8 100644 (file)
--- a/src/hooks/dhcp/high_availability/meson.build
+++ b/src/hooks/dhcp/high_availability/meson.build
@@ -17,7 +17,7 @@ dhcp_ha_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/host_cache/meson.build b/src/hooks/dhcp/host_cache/meson.build
index b8e520176b1089c142f5ba61b4b63fc9a1582394..6fbb84ba58454ac392dbae894d8569ec2d3b82b9 100644 (file)
--- a/src/hooks/dhcp/host_cache/meson.build
+++ b/src/hooks/dhcp/host_cache/meson.build
@@ -11,7 +11,7 @@ dhcp_host_cache_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/host_cmds/meson.build b/src/hooks/dhcp/host_cmds/meson.build
index b140407f35024c493184a7a0cf4c9e21d15c01f5..bf14e5a44ec3929907cd5b01004a685cc65dcf86 100644 (file)
--- a/src/hooks/dhcp/host_cmds/meson.build
+++ b/src/hooks/dhcp/host_cmds/meson.build
@@ -8,7 +8,7 @@ dhcp_host_cmds_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/lease_cmds/meson.build b/src/hooks/dhcp/lease_cmds/meson.build
index d2701aa8e9ef7dfd094d576c76e4764f2bccf37b..e5c96ba763f06a789019f076dfa3664a9ebb57d8 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/meson.build
+++ b/src/hooks/dhcp/lease_cmds/meson.build
@@ -10,7 +10,7 @@ dhcp_lease_cmds_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/lease_query/meson.build b/src/hooks/dhcp/lease_query/meson.build
index 95c7f188489279b61dc6fbdf992df7895d0ec40e..bd8ff5d2a1ccc55ebf55227467dcc90fd23327aa 100644 (file)
--- a/src/hooks/dhcp/lease_query/meson.build
+++ b/src/hooks/dhcp/lease_query/meson.build
@@ -16,7 +16,7 @@ dhcp_lease_query_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/limits/meson.build b/src/hooks/dhcp/limits/meson.build
index d008af33ad9df829a169a2f012ca20d5c3c748af..58390145c6c04565d6bdd10ba5ebe518474ff9d1 100644 (file)
--- a/src/hooks/dhcp/limits/meson.build
+++ b/src/hooks/dhcp/limits/meson.build
@@ -11,7 +11,7 @@ dhcp_limits_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.'), include_directories('..')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/mysql/meson.build b/src/hooks/dhcp/mysql/meson.build
index e1f041555f3d895de7198ca08697aef3edc4f15d..df18728f3ef9d8c9e89628a9ea159aa2675c0bfa 100644 (file)
--- a/src/hooks/dhcp/mysql/meson.build
+++ b/src/hooks/dhcp/mysql/meson.build
@@ -23,7 +23,7 @@ dhcp_mysql_lib = shared_library(
     dependencies: [CRYPTO_DEP, MYSQL_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/perfmon/meson.build b/src/hooks/dhcp/perfmon/meson.build
index 5a55675d2db096bd1ef881b5b457e26c6b95ab1c..ac1c0d7d9d43e566823aa891c5761117f41bf805 100644 (file)
--- a/src/hooks/dhcp/perfmon/meson.build
+++ b/src/hooks/dhcp/perfmon/meson.build
@@ -13,7 +13,7 @@ dhcp_perfmon_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/pgsql/meson.build b/src/hooks/dhcp/pgsql/meson.build
index c38e103eeac3e8ce9e7169a79b3e657d6fa1b2bb..7ab4d20d6a988c028c263e60cd6dd8433d9cb69b 100644 (file)
--- a/src/hooks/dhcp/pgsql/meson.build
+++ b/src/hooks/dhcp/pgsql/meson.build
@@ -23,7 +23,7 @@ dhcp_pgsql_lib = shared_library(
     dependencies: [CRYPTO_DEP, POSTGRESQL_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/ping_check/meson.build b/src/hooks/dhcp/ping_check/meson.build
index 320d6be7e138614e77f89f0b5454513400d4de93..c395fcab966f9d2eda81da0b7e59734c21f20670 100644 (file)
--- a/src/hooks/dhcp/ping_check/meson.build
+++ b/src/hooks/dhcp/ping_check/meson.build
@@ -14,7 +14,7 @@ dhcp_ping_check_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/radius/meson.build b/src/hooks/dhcp/radius/meson.build
index 30b1b124fd254ffbba857831439dad92d22b7c42..8101d581cbf0ee9eda42f4dc9b8b4714b46dafbb 100644 (file)
--- a/src/hooks/dhcp/radius/meson.build
+++ b/src/hooks/dhcp/radius/meson.build
@@ -29,7 +29,7 @@ dhcp_radius_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/run_script/meson.build b/src/hooks/dhcp/run_script/meson.build
index 8dc26670340d3f60cc14adab88c609faecc31052..cde24561026040ee5990c0397d67d5892523cb96 100644 (file)
--- a/src/hooks/dhcp/run_script/meson.build
+++ b/src/hooks/dhcp/run_script/meson.build
@@ -8,7 +8,7 @@ dhcp_run_script_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/stat_cmds/meson.build b/src/hooks/dhcp/stat_cmds/meson.build
index 7de7423dbc7305304c51852ee94ad2827df4ce02..b9c37b1da3a296679f59f80143e20a03f7f6aa3c 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/meson.build
+++ b/src/hooks/dhcp/stat_cmds/meson.build
@@ -8,7 +8,7 @@ dhcp_stat_cmds_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/subnet_cmds/meson.build b/src/hooks/dhcp/subnet_cmds/meson.build
index f24fcb40e4609795e4f5ecb92a6da22053d602fb..e579f230fd89a30cdfd2047a7d3cee81aebd9d33 100644 (file)
--- a/src/hooks/dhcp/subnet_cmds/meson.build
+++ b/src/hooks/dhcp/subnet_cmds/meson.build
@@ -8,7 +8,7 @@ dhcp_subnet_cmds_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/hooks/dhcp/user_chk/meson.build b/src/hooks/dhcp/user_chk/meson.build
index 40439edbd8b0878656c3095e40129ffcec4f8a05..57bb5258e068c0d4ed27fa1cd437f1780ff5a45e 100644 (file)
--- a/src/hooks/dhcp/user_chk/meson.build
+++ b/src/hooks/dhcp/user_chk/meson.build
@@ -13,7 +13,7 @@ dhcp_user_chk_lib = shared_library(
     'version.cc',
     include_directories: [include_directories('.')] + INCLUDES,
     install: false,
-    install_dir: 'lib/kea/hooks',
+    install_dir: LIBDIR / 'kea/hooks',
     link_with: LIBS_BUILT_SO_FAR,
     name_suffix: 'so',
 )

diff --git a/src/lib/asiodns/meson.build b/src/lib/asiodns/meson.build
index 1756d5eed3cc2fa63d4eb1d21316647244c12798..a1841f140c1fd08efe3f01a5ecf74834e4f51e3b 100644 (file)
--- a/src/lib/asiodns/meson.build
+++ b/src/lib/asiodns/meson.build
@@ -5,7 +5,7 @@ kea_asiodns_lib = shared_library(
     'logger.cc',
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '60.0.0',
 )

diff --git a/src/lib/asiolink/meson.build b/src/lib/asiolink/meson.build
index 57f4d5c22b5c713bb37c188fe5bdf6e9aa02fa7a..f44cbcc001ea74e68ec450f2467e159b74e59d3b 100644 (file)
--- a/src/lib/asiolink/meson.build
+++ b/src/lib/asiolink/meson.build
@@ -17,7 +17,7 @@ kea_asiolink_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '83.0.0',
     # Avoids: ld: error: undefined symbol: environ on FreeBSD

diff --git a/src/lib/cc/meson.build b/src/lib/cc/meson.build
index b59ddd6ce434893625922e7db7ba3b7e0df326b8..ba7016c8e2ab9bb77582e459391ee9a954481a78 100644 (file)
--- a/src/lib/cc/meson.build
+++ b/src/lib/cc/meson.build
@@ -17,7 +17,7 @@ kea_cc_lib = shared_library(
     cpp_args: kea_cc_lib_cpp_args,
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '80.0.0',
 )

diff --git a/src/lib/config/meson.build b/src/lib/config/meson.build
index fcb7c9480021bb3fd156d5091e5072457a774378..9b354eb338d7724dec10e085bfb41a30cc5a15b0 100644 (file)
--- a/src/lib/config/meson.build
+++ b/src/lib/config/meson.build
@@ -16,7 +16,7 @@ kea_config_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '80.0.0',
 )

diff --git a/src/lib/cryptolink/meson.build b/src/lib/cryptolink/meson.build
index bb6513c702b323659f76e6d150533c8649c84ea1..f8ec8a8e31de169e5583d183e49d7a8729730347 100644 (file)
--- a/src/lib/cryptolink/meson.build
+++ b/src/lib/cryptolink/meson.build
@@ -15,7 +15,7 @@ kea_cryptolink_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '61.0.0',
 )

diff --git a/src/lib/d2srv/meson.build b/src/lib/d2srv/meson.build
index 564d26b4b4fb89cc89b556b78c5a6b1126149de0..f7e414a0fca8cd75350a20222c899eaaeb5c09f7 100644 (file)
--- a/src/lib/d2srv/meson.build
+++ b/src/lib/d2srv/meson.build
@@ -14,7 +14,7 @@ kea_d2srv_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '61.0.0',
 )

diff --git a/src/lib/database/meson.build b/src/lib/database/meson.build
index 0b9f3f53f469aeb52af9683374810b205f4fb499..24aff28b44cc5366d35c494f7f68d1d5bc13db5d 100644 (file)
--- a/src/lib/database/meson.build
+++ b/src/lib/database/meson.build
@@ -11,7 +11,7 @@ kea_database_lib = shared_library(
     'server_selector.cc',
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '74.0.0',
 )

diff --git a/src/lib/dhcp/meson.build b/src/lib/dhcp/meson.build
index 212653c1b4e1906ba90161b38995bf0c42d23068..e949b77b9c17f5f4ceafcb15a122733b4cfd2cf3 100644 (file)
--- a/src/lib/dhcp/meson.build
+++ b/src/lib/dhcp/meson.build
@@ -56,7 +56,7 @@ kea_dhcp_lib = shared_library(
     'protocol_util.cc',
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '106.0.0',
 )

diff --git a/src/lib/dhcp_ddns/meson.build b/src/lib/dhcp_ddns/meson.build
index 2b741155c165350957fe7b6f78c79bca9b1e5cd9..64be8cc7e0734495a399b1757aa89b3078cf64a5 100644 (file)
--- a/src/lib/dhcp_ddns/meson.build
+++ b/src/lib/dhcp_ddns/meson.build
@@ -7,7 +7,7 @@ kea_dhcp_ddns_lib = shared_library(
     'ncr_udp.cc',
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '66.0.0',
 )

diff --git a/src/lib/dhcpsrv/meson.build b/src/lib/dhcpsrv/meson.build
index 46fae580ee54bb8e9fabd67a4bc7b9dd2fabe90d..051b458b03ddc86bbb56bfc85e3c50e505725fba 100644 (file)
--- a/src/lib/dhcpsrv/meson.build
+++ b/src/lib/dhcpsrv/meson.build
@@ -95,7 +95,7 @@ kea_dhcpsrv_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '125.0.0',
 )

diff --git a/src/lib/dns/meson.build b/src/lib/dns/meson.build
index 3e40a4f92d47ea0275cf68367db0d6eb33261a14..a9d0038520eeaed4dc7d8f3d3dc0ff3a408cdb91 100644 (file)
--- a/src/lib/dns/meson.build
+++ b/src/lib/dns/meson.build
@@ -28,7 +28,7 @@ kea_dns_lib = shared_library(
     'tsigrecord.cc',
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '68.0.0',
 )

diff --git a/src/lib/eval/meson.build b/src/lib/eval/meson.build
index c14e2cb979ae87100c3b9bfa438a498421225ba7..1473642ef7c5cc9001791fd26bc2e9d53f6d5803 100644 (file)
--- a/src/lib/eval/meson.build
+++ b/src/lib/eval/meson.build
@@ -10,7 +10,7 @@ kea_eval_lib = shared_library(
     'token.cc',
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '81.0.0',
 )

diff --git a/src/lib/exceptions/meson.build b/src/lib/exceptions/meson.build
index a1916185ce086194664b59dbcff0b779e2278be9..f0af9199d9b347a3ae6fd545102ab2bc0d3705bc 100644 (file)
--- a/src/lib/exceptions/meson.build
+++ b/src/lib/exceptions/meson.build
@@ -3,7 +3,7 @@ kea_exceptions_lib = shared_library(
     'exceptions.cc',
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '43.0.0',
 )

diff --git a/src/lib/hooks/meson.build b/src/lib/hooks/meson.build
index 711cd77821e1407ed2865b526353f0a46be8dd78..2fd39408495f1a58ff07488250c775dc03eb1cab 100644 (file)
--- a/src/lib/hooks/meson.build
+++ b/src/lib/hooks/meson.build
@@ -16,7 +16,7 @@ kea_hooks_lib = shared_library(
     cpp_args: [f'-DDEFAULT_HOOKS_PATH="@DEFAULT_HOOKS_PATH@"'],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '114.0.0',
 )

diff --git a/src/lib/http/meson.build b/src/lib/http/meson.build
index c8576cb31558109065a24a2fa9ada3dbbac747d7..b1d156a7a9387e3f2d3775da37ac4f9c5d350d72 100644 (file)
--- a/src/lib/http/meson.build
+++ b/src/lib/http/meson.build
@@ -28,7 +28,7 @@ kea_http_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '85.0.0',
 )

diff --git a/src/lib/log/interprocess/meson.build b/src/lib/log/interprocess/meson.build
index 668ab9fe06c9ea7b05f108d594bb05863598d959..6fd527391b27ef4a8da1fcfec76839aad0d5b522 100644 (file)
--- a/src/lib/log/interprocess/meson.build
+++ b/src/lib/log/interprocess/meson.build
@@ -5,7 +5,7 @@ kea_log_interprocess_lib = shared_library(
     cpp_args: [f'-DLOCKFILE_DIR="@TOP_BUILD_DIR@"'],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '1.0.0',
 )

diff --git a/src/lib/log/meson.build b/src/lib/log/meson.build
index ae664362546393ca23b4fc38289c57f91a2314b8..359fea7f57983ed55a148ba3937e6a2e55511708 100644 (file)
--- a/src/lib/log/meson.build
+++ b/src/lib/log/meson.build
@@ -23,7 +23,7 @@ kea_log_lib = shared_library(
     dependencies: [LOG4CPLUS_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '72.0.0',
 )

diff --git a/src/lib/mysql/meson.build b/src/lib/mysql/meson.build
index 7420bd139ed154cf6a0e6722b6f8241c6f312a24..9d416ce8c9769b70b4737d894e3ef04eb5e72197 100644 (file)
--- a/src/lib/mysql/meson.build
+++ b/src/lib/mysql/meson.build
@@ -10,7 +10,7 @@ kea_mysql_lib = shared_library(
     dependencies: [MYSQL_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '85.0.0',
 )

diff --git a/src/lib/pgsql/meson.build b/src/lib/pgsql/meson.build
index 644c2669e3cd8e5180f3fa12d2e9e17a4b48e027..957c03ed11b5d048cf39583ee1ff5d569cdfd1b2 100644 (file)
--- a/src/lib/pgsql/meson.build
+++ b/src/lib/pgsql/meson.build
@@ -10,7 +10,7 @@ kea_pgsql_lib = shared_library(
     dependencies: [POSTGRESQL_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '85.0.0',
 )

diff --git a/src/lib/process/cfgrpt/meson.build b/src/lib/process/cfgrpt/meson.build
index ecd1b2cf6e394f9597f020822e658c4e5bddea29..b768d8478ca8a40b3ad02c7b6e32dd54aa783c0f 100644 (file)
--- a/src/lib/process/cfgrpt/meson.build
+++ b/src/lib/process/cfgrpt/meson.build
@@ -10,7 +10,7 @@ kea_cfgrpt_lib = shared_library(
     config_report_cc,
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '1.0.0',
 )

diff --git a/src/lib/process/meson.build b/src/lib/process/meson.build
index a1f48887c450fb839bf27517713036622ecf4b09..e1ce5e1322d29f7fd48e7569b59a049a23a5c40a 100644 (file)
--- a/src/lib/process/meson.build
+++ b/src/lib/process/meson.build
@@ -16,7 +16,7 @@ kea_process_lib = shared_library(
     dependencies: [GTEST_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '86.0.0',
 )

diff --git a/src/lib/stats/meson.build b/src/lib/stats/meson.build
index 7ac273c45cbdd200640b2c162230613ba5ad8c83..6edbdba848d5fea9229ea76015410d2494e82077 100644 (file)
--- a/src/lib/stats/meson.build
+++ b/src/lib/stats/meson.build
@@ -5,7 +5,7 @@ kea_stats_lib = shared_library(
     'stats_mgr.cc',
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '51.0.0',
 )

diff --git a/src/lib/tcp/meson.build b/src/lib/tcp/meson.build
index 0d615c7dd6877f53630f4a5b89b68b9bd8f42a93..90046b9016d8241439d96e40f77e8c0e373b3d25 100644 (file)
--- a/src/lib/tcp/meson.build
+++ b/src/lib/tcp/meson.build
@@ -10,7 +10,7 @@ kea_tcp_lib = shared_library(
     dependencies: [CRYPTO_DEP],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '31.0.0',
 )

diff --git a/src/lib/util/io/meson.build b/src/lib/util/io/meson.build
index e336d9215ed484e78d01aaeb50b1162f05d78b4a..c4a80af7eea0545254d9192657908e9352d70dc3 100644 (file)
--- a/src/lib/util/io/meson.build
+++ b/src/lib/util/io/meson.build
@@ -3,7 +3,7 @@ kea_util_io_lib = shared_library(
     'fd.cc',
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '10.0.0',
 )

diff --git a/src/lib/util/meson.build b/src/lib/util/meson.build
index bde34f1481c6e31f6b299b020465d251dbd5c22a..251258bcfb8e0f55e79e7c3baddeb95a79817c73 100644 (file)
--- a/src/lib/util/meson.build
+++ b/src/lib/util/meson.build
@@ -21,7 +21,7 @@ kea_util_lib = shared_library(
     'watch_socket.cc',
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '98.0.0',
 )

diff --git a/src/lib/yang/meson.build b/src/lib/yang/meson.build
index af1a5f27251431cab96b89dbfcf19a7b6b24c10e..8795985e18a2aecadfa4b8f5ab50d1b27eda8fe1 100644 (file)
--- a/src/lib/yang/meson.build
+++ b/src/lib/yang/meson.build
@@ -26,7 +26,7 @@ kea_yang_lib = shared_library(
     dependencies: NETCONF_DEP,
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
-    install_dir: 'lib',
+    install_dir: LIBDIR,
     link_with: LIBS_BUILT_SO_FAR,
     version: '71.0.0',
     override_options: ['cpp_std=c++20'],