doc/meson: fix installation with missing info page

diff --git a/doc/meson.build b/doc/meson.build
index 7dfe46525ee2ec02958e5b6f0985fbcba046964d..a911f92389cb78815113842b3d6da304be677189 100644 (file)
--- 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 0abd9254a12191146267c9d301eb1790f3848f2d..5cc18302ef3b501cfd4fe2d7dbbc86a4cc0cc771 100755 (executable)
--- 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