[gnunet] branch master updated (5d6900718 -> 68dbb331f)

[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 5d6900718 DOC: Manpage cleanup
     new aaf00be2d - update submodule
     new ece286945 - update submodule
     new 9e16e9f3a - update submodule
     new 68dbb331f - fix

The 4 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:
 doc/Makefile.am | 28 +++++++---------------------
 doc/sphinx      |  2 +-
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 63af26bbd..20eebaf30 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,37 +1,23 @@
 # This Makefile.am is in the public domain
 
-SUBDIRS = .
+# A note on sphinx:
+# gnunet-handbook does not have a Makefile.am.
+# It only supports building the documentation (and cleanup).
+# So, the only targets used are "make (all)" and "make clean".
+# Actuall installation of manpages/docs is done below
+
+SUBDIRS = sphinx .
 
 if HAVE_DOXY_BINARY
   SUBDIRS += doxygen
 endif
 
-sphinx/_build/texinfo/gnunet.info:
-       cd sphinx && make info
-
-sphinx/_build/html:
-       cd sphinx && make html
-
-sphinx: sphinx/_build/texinfo/gnunet.info sphinx/_build/html
-       cd sphinx && make html info
-
 install-data-hook: sphinx
        mkdir -p $(DESTDIR)$(docdir)
        cp -pr sphinx/_build/html $(DESTDIR)$(docdir)
        mkdir -p $(DESTDIR)$(infodir)
        cp -pr sphinx/_build/texinfo/gnunet.info $(DESTDIR)$(infodir)
 
-clean-local:
-       cd sphinx && make clean
-
-sphinx/_build/man/gnunet.1:
-       cd sphinx && make man
-
-sphinx-man:
-       cd sphinx && make man
-
-.DEFAULT: sphinx-man
-
 if INCLUDE_MANPAGES
 man_MANS = \
        sphinx/_build/man/gnunet.1 \
diff --git a/doc/sphinx b/doc/sphinx
index 0f3577142..7b4f05b78 160000
--- a/doc/sphinx
+++ b/doc/sphinx
@@ -1 +1 @@
-Subproject commit 0f3577142f9e9fb623ddbb28ffe9766b52c8e47b
+Subproject commit 7b4f05b78016a84e6be77f1257d05652217eb6b7

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