[#3731] More builtin options

diff --git a/meson.build b/meson.build
index f1c8c5ae5741cf1d9bd008b50d48cbbe88687583..a3dee9b0306f6cdabf763605a36edcb21fcd5a8c 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -39,6 +39,7 @@ TOP_SOURCE_DIR = meson.current_source_dir()
 
 BINDIR = get_option('bindir')
 DATADIR = get_option('datadir')
+INCLUDEDIR = get_option('includedir')
 LIBDIR = get_option('libdir')
 LOCALSTATEDIR = get_option('localstatedir')
 MANDIR = get_option('mandir')
@@ -840,7 +841,7 @@ configure_file(
     output: 'config.h',
     configuration: conf_data,
     install: true,
-    install_dir: 'include/kea',
+    install_dir: INCLUDEDIR / 'kea',
 )
 
 # TODO: Change to kea_version.h.in when autotools are removed.
@@ -849,7 +850,7 @@ configure_file(
     output: 'kea_version.h',
     configuration: conf_data,
     install: true,
-    install_dir: 'include/kea',
+    install_dir: INCLUDEDIR / 'kea',
 )
 
 #### Build Starts Here
@@ -897,7 +898,8 @@ top_docs = [
     'platforms.rst',
 ]
 install_data(top_docs, install_dir: DATADIR / 'doc/kea')
-install_emptydir('var/run/kea')
+# No builtin option for 'var/run'.
+install_emptydir(LOCALSTATEDIR / 'run/kea')
 
 # Print the setup report.
 message(run_command(['cat', CONFIG_REPORT], check: true).stdout())

diff --git a/src/bin/keactrl/meson.build b/src/bin/keactrl/meson.build
index c1b3fe34a74f85d6c05122d375f5a0b5af763bc0..4b17a79b89d6b94d792aef07a5af9590eee54848 100644 (file)
--- a/src/bin/keactrl/meson.build
+++ b/src/bin/keactrl/meson.build
@@ -1,6 +1,6 @@
 keactrl_conf_data = configuration_data()
 keactrl_conf_data.set('prefix', PREFIX)
-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}/' + SBINDIR)

diff --git a/src/share/yang/modules/utils/meson.build b/src/share/yang/modules/utils/meson.build
index bbd54d7d9493431fe62e54720544447c4417c456..7ff86ad5301bd0e1c22089ca0c701714920ae544 100644 (file)
--- a/src/share/yang/modules/utils/meson.build
+++ b/src/share/yang/modules/utils/meson.build
@@ -30,5 +30,5 @@ configure_file(
     output: 'reinstall.sh',
     configuration: yang_utils_conf_data,
     install: true,
-    install_dir: 'share/kea/yang/modules/utils',
+    install_dir: DATADIR / 'kea/yang/modules/utils',
 )