GANA: Update submodule

1 files changed, 4 insertions, 32 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index c4e5671bb..151f83267 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,30 +1,16 @@
 # This Makefile.am is in the public domain
 
-# 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
-# Also, the manpages are handled in man/, but some of them are built using
-# sphinx in all-local
-
 SUBDIRS = .
 
 if HAVE_DOXY_BINARY
   SUBDIRS += doxygen
 endif
 
-all-local:
-        cd sphinx && make all
-
-clean-local:
-        cd sphinx && make clean
-
 install-data-hook:
         mkdir -p $(DESTDIR)$(docdir)
-        cp -pr sphinx/_build/html $(DESTDIR)$(docdir)
+        cp -pr handbook/html $(DESTDIR)$(docdir)
         mkdir -p $(DESTDIR)$(infodir)
-        cp -pr sphinx/_build/texinfo/gnunet.info $(DESTDIR)$(infodir)
+        cp -pr handbook/texinfo/gnunet.info $(DESTDIR)$(infodir)
 
 if INCLUDE_MANPAGES
 SUBDIRS += man
@@ -40,21 +26,7 @@ endif
 #  sphinx/_build/texinfo/gnunet.texi
 
 EXTRA_DIST = \
-        sphinx/_build/texinfo/gnunet.info \
+        handbook/texinfo/gnunet.info \
         system_specific/outdated-and-old-installation-instructions.txt \
         system_specific/FROM_SOURCE \
-        sphinx/_build/html \
-        sphinx/about.rst \
-        sphinx/conf.py \
-        sphinx/faq.rst \
-        sphinx/gana \
-        sphinx/guis \
-        sphinx/index.rst \
-        sphinx/installing.rst \
-        sphinx/livingstandards.rst \
-        sphinx/make.bat \
-        sphinx/developers \
-        sphinx/users \
-        sphinx/preface.rst \
-        sphinx/_static \
-        sphinx/Makefile
+        handbook/html