[#3731] Got rid of local get_option

diff --git a/doc/sphinx/meson.build b/doc/sphinx/meson.build
index 8b940965f7ae46564b99ee522174f1685c555213..7dbab469e7874c129c015796d47bd507901a8ae9 100644 (file)
--- a/doc/sphinx/meson.build
+++ b/doc/sphinx/meson.build
@@ -121,8 +121,7 @@ doc_conf.set('PREFIX', PREFIX)
 docdir = f'@DATADIR@/doc/kea'
 doc_conf.set('docdir', docdir)
 doc_conf.set('INSTALL', INSTALL.full_path())
-mandir = get_option('mandir')
-mandir8 = f'@mandir@/man8/'
+mandir8 = f'@MANDIR@/man8/'
 doc_conf.set('mandir8', mandir8)
 
 make_doc = configure_file(

diff --git a/meson.build b/meson.build
index 0208d9e7322e4eb1e718c94744d6d2ddc111d812..6446f6b9da65d2802e44af04371a137fb39c3559 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -18,7 +18,9 @@ TOP_SOURCE_DIR = meson.current_source_dir()
 DATADIR = get_option('datadir')
 LIBDIR = get_option('libdir')
 LOCALSTATEDIR = get_option('localstatedir')
+MANDIR = get_option('mandir')
 PREFIX = get_option('prefix')
+SBINDIR = get_option('sbindir')
 SYSCONFDIR = get_option('sysconfdir')
 
 DHCP_DATA_DIR = f'@LOCALSTATEDIR@/run/kea'

diff --git a/src/bin/admin/meson.build b/src/bin/admin/meson.build
index a3dd6e98f5a7ab7fe0f81e49e5b74ec99e489d6e..3600cd3446cc20832b69e72ddcc3922292b6f308 100644 (file)
--- a/src/bin/admin/meson.build
+++ b/src/bin/admin/meson.build
@@ -1,24 +1,23 @@
 kea_admin_conf_data = configuration_data()
 kea_admin_conf_data.set('prefix', PREFIX)
 kea_admin_conf_data.set('exec_prefix', '${prefix}')
-datadir = get_option('datadir')
-kea_admin_conf_data.set('datarootdir', '${prefix}/' + datadir)
+kea_admin_conf_data.set('datarootdir', '${prefix}/' + DATADIR)
 kea_admin_conf_data.set('PACKAGE', 'kea')
 kea_admin_conf_data.set('PACKAGE_NAME', 'kea')
 kea_admin_conf_data.set('PACKAGE_VERSION', PROJECT_VERSION)
 kea_admin_conf_data.set('EXTENDED_VERSION', PROJECT_VERSION + ' (tarball)')
 kea_admin_conf_data.set('abs_top_builddir', TOP_BUILD_DIR)
 kea_admin_conf_data.set('abs_top_srcdir', TOP_SOURCE_DIR)
-kea_admin_conf_data.set('sbindir', '${prefix}/' + get_option('sbindir'))
+kea_admin_conf_data.set('sbindir', '${prefix}/' + SBINDIR)
 kea_admin_conf_data.set('variables', 'variables')
 configure_file(
     input: 'kea-admin.in',
     output: 'kea-admin',
     configuration: kea_admin_conf_data,
     install: true,
-    install_dir: get_option('sbindir'),
+    install_dir: SBINDIR,
 )
-adminscriptsdir = f'@datadir@/kea/scripts'
+adminscriptsdir = f'@DATADIR@/kea/scripts'
 configure_file(
     input: 'admin-utils.sh.in',
     output: 'admin-utils.sh',

diff --git a/src/bin/keactrl/meson.build b/src/bin/keactrl/meson.build
index b1ffd73258cb5d92d42f70a0fee312f4ac1d4ee7..3460457d99becffa761cb092c04c389e9a4da3b6 100644 (file)
--- a/src/bin/keactrl/meson.build
+++ b/src/bin/keactrl/meson.build
@@ -3,7 +3,7 @@ keactrl_conf_data.set('prefix', PREFIX)
 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'))
+keactrl_conf_data.set('sbindir', '${prefix}/' + SBINDIR)
 if NETCONF_DEP.found()
     keactrl_conf_data.set('HAVE_NETCONF', 'yes')
 else
@@ -24,7 +24,7 @@ configure_file(
     input: 'keactrl.in',
     output: 'keactrl',
     configuration: keactrl_conf_data,
-    install_dir: get_option('sbindir'),
+    install_dir: SBINDIR,
 )
 path_replacer = f'@TOP_BUILD_DIR@/tools/path_replacer.sh'
 configure_file(

diff --git a/src/bin/shell/meson.build b/src/bin/shell/meson.build
index 3ce85bcd4e88565bfb7cfde11e58d56cccf30183..e2f738f1acd6008e752958f1f7150a315788e84d 100644 (file)
--- a/src/bin/shell/meson.build
+++ b/src/bin/shell/meson.build
@@ -9,7 +9,7 @@ configure_file(
     output: 'kea-shell',
     configuration: kea_shell_conf_data,
     install: true,
-    install_dir: get_option('sbindir'),
+    install_dir: SBINDIR,
 )
 configure_file(
     input: 'kea_conn.py',

diff --git a/tools/meson.build b/tools/meson.build
index 1aeb8c2c7c37d537d000a04998b56f7ad4806374..ee58776e9837bf0a0bc6e56abb330c9ab008c257 100644 (file)
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -1,9 +1,9 @@
 tools_conf_data = configuration_data()
 tools_conf_data.set('prefix', PREFIX)
-tools_conf_data.set('sysconfdir', '${prefix}/' + get_option('sysconfdir'))
-tools_conf_data.set('localstatedir', '${prefix}/' + get_option('localstatedir'))
+tools_conf_data.set('sysconfdir', '${prefix}/' + SYSCONFDIR)
+tools_conf_data.set('localstatedir', '${prefix}/' + LOCALSTATEDIR)
 tools_conf_data.set('exec_prefix', '${prefix}')
-tools_conf_data.set('libdir', '${exec_prefix}/' + get_option('libdir'))
+tools_conf_data.set('libdir', '${exec_prefix}/' + LIBDIR)
 tools_conf_data.set('SEP', '+')
 if BISON.found()
     tools_conf_data.set('YACC', BISON.full_path())