From: Tomas Krizek Date: Mon, 4 Mar 2019 13:42:44 +0000 (+0100) Subject: meson: doc/kresd.8 - manpage nitpicks X-Git-Tag: v4.0.0~24^2~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be33b6dd8d932227dada991a26cdf279f0fe9c90;p=thirdparty%2Fknot-resolver.git meson: doc/kresd.8 - manpage nitpicks --- diff --git a/doc/kresd.8.in b/doc/kresd.8.in index c09ae3bc5..f39b94968 100644 --- a/doc/kresd.8.in +++ b/doc/kresd.8.in @@ -134,7 +134,7 @@ and is compatible with Unbound and BIND 9 root key files. .B \-K\fI keyfile\fR, \fB\-\-keyfile\-ro=\fI (Discouraged) Static root trust anchors file. The file is not updated by kresd. Use of this option is discouraged because it will break your installation when the trust anchor key changes! -Default: "@keyfile_default@" (can be empty if your distribution did not provide one) +Default: "@keyfile_default@" .TP .B \-f\fI N\fR, \fB\-\-forks=\fI With this option, the daemon is started in non-interactive mode and instead creates a diff --git a/doc/meson.build b/doc/meson.build index 2f49a0f22..45143fd08 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -5,8 +5,13 @@ man_config = configuration_data() man_config.set('version', meson.project_version()) man_config.set('date', run_command('../scripts/get-date.sh').stdout()) man_config.set('keyfile_default', keyfile_default) -man_config.set('man_seealso_systemd', - libsystemd.found() ? '\\fIkresd.systemd(7)\\fR, ' : '') + +man_config.set('man_seealso_systemd', '') +if systemd_unit_files == 'enabled' + man_config.set('man_seealso_systemd', '\\fIkresd.systemd(7)\\fR, ') +elif systemd_unit_files == 'nosocket' + man_config.set('man_seealso_systemd', '\\fIkresd.systemd.nosocket(7)\\fR, ') +endif man_kresd = configure_file( input: 'kresd.8.in', diff --git a/meson.build b/meson.build index ebae055ab..b32cf1fab 100644 --- a/meson.build +++ b/meson.build @@ -166,6 +166,7 @@ if systemd_unit_files != 'disabled' subdir('systemd') endif + # Additional files install_data( sources: [