From 9b4f2ac79b68d30baa8cd2117365389f434a9756 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 23 Sep 2020 14:47:21 +0200 Subject: [PATCH] doc/meson.build: kludge to fix manpage installation directory Ugly workaround for https://github.com/mesonbuild/meson/issues/1550 --- doc/meson.build | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/doc/meson.build b/doc/meson.build index e6c1da420..02ffc7f9e 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -39,16 +39,13 @@ if get_option('html_manual') endif if get_option('manpages') - # This installs all manpages in the "man1" subdirectory. Due to - # https://github.com/mesonbuild/meson/issues/1550 there appears to - # be no good solution with Meson. Sigh. custom_target( 'Manpage documentation', - output: 'man1', + output: ['mpd.1', 'mpd.conf.5'], input: ['mpd.1.rst', 'conf.py'], - command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@'], + command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTDIR@'], build_by_default: true, install: true, - install_dir: get_option('mandir'), + install_dir: [join_paths(get_option('mandir'), 'man1'), join_paths(get_option('mandir'), 'man5')], ) endif