gnunet

commit 6a9f604210b55eb75545eb6423c89093ec5417c5
parent 7a2a6471da82b7518f872373e99d2aac00e84a54
Author: Christian Grothoff <christian@grothoff.org>
Date:   Sat, 24 Sep 2022 12:22:07 +0200

-fix installation of gnunet.info

Diffstat:
M
bootstrap
 | 
8
++++++++
M
doc/Makefile.am
 | 
16
+++++++---------

2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/bootstrap b/bootstrap
@@ -87,6 +87,13 @@ check_libtool()
     fi
 }
 
+sphinx ()
+{
+    # Bootstrap Sphinx documentation
+    cd doc/sphinx; make man info ; cd -
+}
+
+
 submodules()
 {
     # Try to update the submodule. Since bootstrap
@@ -142,6 +149,7 @@ main()
     gana_update
     check_uncrustify
     check_yapf
+    sphinx
     check_libtool
 }
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -1,8 +1,7 @@
 # This Makefile.am is in the public domain
 
-
 if DOCUMENTATION
-  SUBDIRS = doxygen
+  SUBDIRS = . doxygen
 all-local:
 	cd sphinx && make html
 
@@ -10,17 +9,18 @@ install-data-hook:
 	mkdir -p $(DESTDIR)$(docdir)
 	cp -pr sphinx/_build/html $(DESTDIR)$(docdir)
 
-sphinx/_build/man/gnunet.1: Makefile
-	cd sphinx && make man
-
 if INCLUDE_MANPAGES
-# FIXME this is somehow broken on openbsd. See #7324
 man_MANS = sphinx/_build/man/gnunet.1
 SUBDIRS += man
 endif
 endif
 
-EXTRA_DIST =							\
+info_TEXINFOS = \
+  sphinx/_build/texinfo/gnunet.texi
+
+EXTRA_DIST = \
+    sphinx/_build/man/gnunet.1 \
+    sphinx/_build/texinfo/gnunet.texinfo \
 	system_specific/outdated-and-old-installation-instructions.txt \
 	system_specific/FROM_SOURCE \
 	sphinx/about.rst \
@@ -37,5 +37,3 @@ EXTRA_DIST =							\
 	sphinx/preface.rst \
 	sphinx/_static \
 	sphinx/Makefile
-
-