From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Tue, 13 Oct 2020 09:29:31 +0000 (+0200)
Subject: distro/*: package info files
X-Git-Tag: v5.2.0~13^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=937ea4cc13ead523cf83163d77951e223fdafeb3;p=thirdparty%2Fknot-resolver.git

distro/*: package info files
---

diff --git a/NEWS b/NEWS
index b7db0b88d..9e2305e30 100644
--- 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 a14bc764c..d5be5f5c0 100644
--- 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
index 000000000..634061c40
--- /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 73af00b82..cc49e2a86 100644
--- 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 360cdfd7f..7dfe46525 100644
--- 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