distro/*: package info files

diff --git a/NEWS b/NEWS
index b7db0b88d122c69a11ab8a7ff0971014064b1111..9e2305e30f38855c500b69a581abc56d9142917a 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Improvements
 - improve resiliency against UDP fragmentation attacks (disable PMTUD) (!1061)
 - ta_update: warn if there are differences between statically configured
   keys and upstream (#251, !1051)
+- doc: generate info page (!1079)
 
 Bugfixes
 --------

diff --git a/distro/deb/control b/distro/deb/control
index a14bc764c672897e1a8d5793e4a8951d943468f1..d5be5f5c00a13a2bd59b9b11047cbf8983cc2d09 100644 (file)
--- a/distro/deb/control
+++ b/distro/deb/control
@@ -23,6 +23,7 @@ Build-Depends:
  python3-breathe,
  python3-sphinx,
  python3-sphinx-rtd-theme,
+ texinfo,
  libssl-dev,
 Homepage: https://www.knot-resolver.cz/
 

diff --git a/distro/deb/knot-resolver-doc.info b/distro/deb/knot-resolver-doc.info
new file mode 100644 (file)
index 0000000..634061c
--- /dev/null
+++ b/distro/deb/knot-resolver-doc.info
@@ -0,0 +1 @@
+debian/tmp/usr/share/info/knot-resolver.info

diff --git a/distro/rpm/knot-resolver.spec b/distro/rpm/knot-resolver.spec
index 73af00b82d2427eeb26c946bb1e499f32bdb5fd7..cc49e2a865e41deefe9f74aba5c344cfdfbe511b 100644 (file)
--- a/distro/rpm/knot-resolver.spec
+++ b/distro/rpm/knot-resolver.spec
@@ -93,6 +93,7 @@ Requires(pre):  shadow
 BuildRequires:  doxygen
 BuildRequires:  python3-breathe
 BuildRequires:  python3-sphinx_rtd_theme
+BuildRequires:  texinfo
 %endif
 
 %description
@@ -332,6 +333,7 @@ fi
 %files doc
 %dir %{_pkgdocdir}
 %doc %{_pkgdocdir}/html
+%doc %{_datadir}/info/knot-resolver.info*
 %endif
 
 %if "x%{?suse_version}" == "x"

diff --git a/doc/meson.build b/doc/meson.build
index 360cdfd7f759266c3d2662b494ff27f8a49b6b25..7dfe46525ee2ec02958e5b6f0985fbcba046964d 100644 (file)
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -58,10 +58,11 @@ if get_option('doc') == 'enabled'
 
   if makeinfo.found()
     # install info docs
-    install_subdir(
-      join_paths(meson.current_source_dir(), 'texinfo'),
-      strip_directory: true,
-      exclude_files: ['Makefile', 'knot-resolver.texi'],
+    # 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_dir: info_dir,
     )
   endif