[gnunet] branch master updated (6a36ebeab -> 4611664be)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from 6a36ebeab -explicitly fix bsd
     new 2b2c1fcd7 -update sphinx
     new 4611664be DOC: Back to info_TEXINFOS

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bootstrap       |  2 +-
 contrib/sphinx  |  2 +-
 doc/Makefile.am | 20 +++++++++++---------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/bootstrap b/bootstrap
index 2c6cea4ce..5601c730d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -111,7 +111,7 @@ sphinx_update()
       # GNS
       make html >/dev/null || exit 1
       cp -r _build/html ../../doc/handbook/ || exit 1
-      make info >/dev/null || exit 1
+      make texinfo >/dev/null || exit 1
       cp -r _build/texinfo ../../doc/handbook/ || exit 1
       make man >/dev/null || exit 1
       cp -r _build/man/* ../../doc/man || exit 1
diff --git a/contrib/sphinx b/contrib/sphinx
index 7b4f05b78..f2da4005a 160000
--- a/contrib/sphinx
+++ b/contrib/sphinx
@@ -1 +1 @@
-Subproject commit 7b4f05b78016a84e6be77f1257d05652217eb6b7
+Subproject commit f2da4005a848af2ed2c8cacb9f7dfe3ffe7bcaec
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 151f83267..a8b044ccc 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,6 +6,12 @@ if HAVE_DOXY_BINARY
   SUBDIRS += doxygen
 endif
 
+# OpenBSD is a bit iffy wrt sphinx make info
+if OPENBSD
+all-local:
+       cd handbook/texinfo && make || touch gnunet.info
+endif
+
 install-data-hook:
        mkdir -p $(DESTDIR)$(docdir)
        cp -pr handbook/html $(DESTDIR)$(docdir)
@@ -16,17 +22,13 @@ if INCLUDE_MANPAGES
 SUBDIRS += man
 endif
 
-# NOTE: We cannot make this conditional because automake
-# This means that if documentation is built, you MUST also build texinfos
-# and need makeinfo.
-# And yes, sphinx already compiled texi->info at this point and this will
-# re-create it.
-# So, we now manually copy it above in the install-data-hook
-#info_TEXINFOS = \
-#  sphinx/_build/texinfo/gnunet.texi
+AM_MAKEINFOFLAGS = --no-headers --no-split
+
+info_TEXINFOS = \
+  handbook/texinfo/gnunet.texi
 
 EXTRA_DIST = \
-       handbook/texinfo/gnunet.info \
+       handbook/texinfo \
        system_specific/outdated-and-old-installation-instructions.txt \
        system_specific/FROM_SOURCE \
        handbook/html

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.