From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 7 Feb 2019 13:06:48 +0000 (+0100)
Subject: meson: minor fixes
X-Git-Tag: v4.0.0~24^2~168
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b2a73a89ce2c090484b6bb315951fcfb4feeb2d;p=thirdparty%2Fknot-resolver.git

meson: minor fixes
---

diff --git a/doc/kresd.8.in b/doc/kresd.8.in
index 24d1af0c6..6192c67fa 100644
--- a/doc/kresd.8.in
+++ b/doc/kresd.8.in
@@ -165,7 +165,7 @@ Show short commandline option help.
 .B \-V
 Show the version.
 .SH "SEE ALSO"
-@man_seealso_systemd@@man_seealso_htmldoc@\fIhttps://knot-resolver.readthedocs.io/en/v@version@/\fR
+@man_seealso_systemd@\fIhttps://knot-resolver.readthedocs.io/en/v@version@/\fR
 .SH "AUTHORS"
 .B kresd
 developers are mentioned in the AUTHORS file in the distribution.
diff --git a/meson.build b/meson.build
index 0e0de9035..93ed6e1fa 100644
--- a/meson.build
+++ b/meson.build
@@ -45,7 +45,7 @@ endif
 
 ## Trust anchors
 managed_ta = get_option('managed_ta').enabled()
-kefyile_default = get_option('keyfile_default')
+keyfile_default = get_option('keyfile_default')
 if keyfile_default == ''
   keyfile_default = join_paths(etc_dir, 'root.keys')
   install_root_keys = true
@@ -54,7 +54,7 @@ else
   install_root_keys = false
   if managed_ta
     warning('Using managed_ta along with keyfile_default. Ensure '
-	    'keyfile_default will be writable by kresd.')
+	    + 'keyfile_default will be writable by kresd.')
   endif
 endif
 
@@ -82,6 +82,7 @@ if systemd != 'disabled'
   endif
   message('---------------------------')
 endif
+# TODO systemd_user_mode
 
 ## Configuration (for *.in files)
 config = configuration_data()
@@ -138,7 +139,6 @@ integr_tests = [
 # Use "archive" target instead
 run_target(
   'archive',
-  output: 'archive',
   command: [
     'scripts/make-archive.sh',
     meson.project_version(),
@@ -170,6 +170,5 @@ subdir('etc')
 
 # TODO message summary?
 message('modules_dir: ' + modules_dir)
-message(kresd_install_path)
 message('version: @0@'.format(config.get('version')))
 message('date: @0@'.format(config.get('date')))