From d8d75a7c4e519440088ac7159805401b657d8de5 Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Wed, 14 Oct 2020 12:22:53 +0200 Subject: [PATCH] doc/meson: fix installation with missing info page --- doc/meson.build | 5 +++-- scripts/make-doc.sh | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/meson.build b/doc/meson.build index 7dfe46525..a911f9238 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -61,8 +61,9 @@ if get_option('doc') == 'enabled' # FIXME: Sphinx < 2 doesn't create a separate directory for figures, while # a newer one does. To simplify packaging, figures for info pages are # compleltely omitted for now. - install_data( - join_paths(meson.current_source_dir(), 'texinfo', 'knot-resolver.info'), + install_subdir( + join_paths(meson.current_source_dir(), 'texinfo', '.install'), + strip_directory: true, install_dir: info_dir, ) endif diff --git a/scripts/make-doc.sh b/scripts/make-doc.sh index 0abd9254a..5cc18302e 100755 --- a/scripts/make-doc.sh +++ b/scripts/make-doc.sh @@ -20,4 +20,6 @@ if command -v makeinfo &>/dev/null; then rm -rf doc/texinfo ${SPHINX} ${@} -b texinfo -d doc/.doctrees doc doc/texinfo && \ make -C doc/texinfo info + mkdir doc/texinfo/.install + mv doc/texinfo/knot-resolver.info doc/texinfo/.install/ fi -- 2.47.2