[#3731] Fix lockfile default location in meson

diff --git a/meson.build b/meson.build
index f8b40b4816a721b0793a3577e75ff555f95351d6..7e618fa5e8633ca321db531862dba0d048f6008f 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -17,17 +17,17 @@ TOP_SOURCE_DIR = meson.current_source_dir()
 
 DATADIR = get_option('datadir')
 LIBDIR = get_option('libdir')
-RUN_STATE_DIR = get_option('localstatedir')
+LOCALSTATEDIR = get_option('localstatedir')
 PREFIX = get_option('prefix')
 SYSCONFDIR = get_option('sysconfdir')
 
-DHCP_DATA_DIR = f'@PREFIX@/@RUN_STATE_DIR@/run/kea'
+DHCP_DATA_DIR = f'@PREFIX@/@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@/@RUN_STATE_DIR@/lib/kea'
+LEGAL_LOG_DIR = f'@PREFIX@/@LOCALSTATEDIR@/lib/kea'
 
 #### Build Options
 

diff --git a/src/bin/keactrl/meson.build b/src/bin/keactrl/meson.build
index 53d04d33f629195432155a8713fd2cd76acdbdbe..b1ffd73258cb5d92d42f70a0fee312f4ac1d4ee7 100644 (file)
--- a/src/bin/keactrl/meson.build
+++ b/src/bin/keactrl/meson.build
@@ -11,8 +11,8 @@ else
 endif
 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)
+keactrl_conf_data.set('runstatedir', '${prefix}/' + LOCALSTATEDIR + '/run')
+keactrl_conf_data.set('localstatedir', '${prefix}/' + LOCALSTATEDIR)
 kea_configfiles_destdir = f'@SYSCONFDIR@/kea'
 configure_file(
     input: 'keactrl.conf.in',

diff --git a/src/lib/log/interprocess/meson.build b/src/lib/log/interprocess/meson.build
index 6fd527391b27ef4a8da1fcfec76839aad0d5b522..48070da3bc709a6f6021a630d9062b04afc64f43 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="@TOP_BUILD_DIR@"'],
+    cpp_args: [f'-DLOCKFILE_DIR="@LOCALSTATEDIR@/run/kea"'],
     include_directories: [include_directories('.')] + INCLUDES,
     install: true,
     install_dir: LIBDIR,