From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 7 Feb 2019 13:36:24 +0000 (+0100)
Subject: meson: move configuration to appropriate sections
X-Git-Tag: v4.0.0~24^2~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=294d49cd890355b02275938fabc3e70df408ce1f;p=thirdparty%2Fknot-resolver.git

meson: move configuration to appropriate sections
---

diff --git a/daemon/lua/meson.build b/daemon/lua/meson.build
index 59ce08249..3d725962a 100644
--- a/daemon/lua/meson.build
+++ b/daemon/lua/meson.build
@@ -1,9 +1,18 @@
 # daemon: lua modules + embed
 
+ta_config = configuration_data()
+ta_config.set('keyfile_default', keyfile_default)
+ta_config.set('etc_dir', etc_dir)
+trust_anchors = configure_file(
+  input: 'trust_anchors.lua.in',
+  output: 'trust_anchors.lua',
+  configuration: ta_config,
+)
+
 lua_src += [
   files('kres.lua'),
   files('kres-gen.lua'),
-  # trust_anchors.lua.in handled separately
+  trust_anchors,
   files('zonefile.lua'),
 ]
 
@@ -12,15 +21,6 @@ config_tests += [
 ]
 
 
-# trust_anchors lua module
-configure_file(
-  input: 'trust_anchors.lua.in',
-  output: 'trust_anchors.lua',
-  configuration: config,
-  install_dir: modules_dir,
-)
-
-
 # embed lua to daemon
 if get_option('daemon')
   message('--- required kresd dependencies ---')
diff --git a/doc/meson.build b/doc/meson.build
index 03b134613..73116cd74 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,12 +1,22 @@
 # documentation
 
 # man page
-configure_file(
+man_config = configuration_data()
+man_config.set('version', meson.project_version())
+man_config.set('date', run_command('scripts/get-date.sh', check: true)
+man_config.set('keyfile_default', keyfile_default)
+man_config.set('modules_dir', modules_dir)
+
+# TODO use correct systemd man page
+man_config.set('man_seealso_systemd', '')
+#man_config.set('man_seealso_systemd', '\\fIkresd.systemd(7)\\fR, ')
+
+man_kresd = configure_file(
   input: 'kresd.8.in',
   output: 'kresd.8',
-  configuration: config,
-  install_dir: join_paths(prefix, get_option('mandir'), 'man8')
+  configuration: man_config,
 )
+install_man(man_kresd)
 
 
 if get_option('doc')  # doxygen + html docs
diff --git a/meson.build b/meson.build
index 93ed6e1fa..bd0b6fe8b 100644
--- a/meson.build
+++ b/meson.build
@@ -84,18 +84,6 @@ if systemd != 'disabled'
 endif
 # TODO systemd_user_mode
 
-## Configuration (for *.in files)
-config = configuration_data()
-config.set('keyfile_default', get_option('keyfile_default'))
-config.set('modules_dir', etc_dir)
-config.set('etc_dir', etc_dir)
-config.set('version', meson.project_version())
-config.set('date', run_command('scripts/get-date.sh', check: true).stdout().strip())
-
-# TODO use correct systemd man page
-config.set('man_seealso_systemd', '')
-#config.set('man_seealso_systemd', '\\fIkresd.systemd(7)\\fR, ')
-
 # TODO use var instead
 add_global_arguments(
   '-D_GNU_SOURCE',