GANA: Update submodule

5 files changed, 31 insertions, 53 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
diff --git a/doc/handbook/.gitignore b/doc/handbook/.gitignore
new file mode 100644
index 000000000..26718c2e9
--- /dev/null
+++ b/doc/handbook/.gitignore
@@ -0,0 +1,2 @@
+html/
+texinfo/
diff --git a/doc/man/.gitignore b/doc/man/.gitignore
index 38ed67872..decad311d 100644
--- a/doc/man/.gitignore
+++ b/doc/man/.gitignore
@@ -3,3 +3,7 @@ groff_lint.log
 *.html
 gnunet-c-tutorial.7
 gnunet-documentation.7
+gana.*
+gnunet.*
+gnunet-dev.*
+lsd.*
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index 262441e9d..be7a810f8 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -36,27 +36,27 @@ endif
 endif
 
 man_MANS = \
-  ../sphinx/_build/man/gnunet.1 \
-        ../sphinx/_build/man/gnunet.2 \
-        ../sphinx/_build/man/gnunet.3 \
-        ../sphinx/_build/man/gnunet.4 \
-        ../sphinx/_build/man/gnunet.5 \
-        ../sphinx/_build/man/gnunet.6 \
-        ../sphinx/_build/man/gnunet.7 \
-        ../sphinx/_build/man/gnunet.8 \
-        ../sphinx/_build/man/gnunet.9 \
-        ../sphinx/_build/man/gana.1 \
-        ../sphinx/_build/man/gana.2 \
-        ../sphinx/_build/man/gana.3 \
-        ../sphinx/_build/man/gana.4 \
-        ../sphinx/_build/man/gana.5 \
-        ../sphinx/_build/man/gnunet-dev.1 \
-        ../sphinx/_build/man/gnunet-dev.2 \
-        ../sphinx/_build/man/gnunet-dev.3 \
-        ../sphinx/_build/man/gnunet-dev.4 \
-        ../sphinx/_build/man/gnunet-dev.5 \
-        ../sphinx/_build/man/gnunet-dev.6 \
-        ../sphinx/_build/man/lsd.1 \
+  gnunet.1 \
+        gnunet.2 \
+        gnunet.3 \
+        gnunet.4 \
+        gnunet.5 \
+        gnunet.6 \
+        gnunet.7 \
+        gnunet.8 \
+        gnunet.9 \
+        gana.1 \
+        gana.2 \
+        gana.3 \
+        gana.4 \
+        gana.5 \
+        gnunet-dev.1 \
+        gnunet-dev.2 \
+        gnunet-dev.3 \
+        gnunet-dev.4 \
+        gnunet-dev.5 \
+        gnunet-dev.6 \
+        lsd.1 \
   gnunet.conf.5 \
   gnunet-arm.1 \
   gnunet-ats.1 \
diff --git a/doc/sphinx b/doc/sphinx
deleted file mode 160000
-Subproject 7b4f05b78016a84e6be77f1257d05652217eb6b