1 files changed, 28 insertions, 2 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index ba3024b12..84e7e5fbd 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,12 +2,38 @@
 
 
 if DOCUMENTATION
-  SUBDIRS = doxygen sphinx
+  SUBDIRS = doxygen
+all-local:
+        cd sphinx && make html
+
+install-data-hook:
+        mkdir -p $(DESTDIR)$(docdir)
+        cp -pr sphinx/_build/html $(DESTDIR)$(docdir)
+
+_build/man/gnunet.1: Makefile
+        cd sphinx && make man
+
 if INCLUDE_MANPAGES
+man_MANS = sphinx/_build/man/gnunet.1
   SUBDIRS += man
 endif
 endif
 
 EXTRA_DIST =                                                    \
         system_specific/outdated-and-old-installation-instructions.txt \
-        system_specific/FROM_SOURCE
+        system_specific/FROM_SOURCE \
+        sphinx/about.rst \
+        sphinx/conf.py \
+        sphinx/faq.rst \
+        sphinx/gana.rst \
+        sphinx/guis \
+        sphinx/index.rst \
+        sphinx/installing.rst \
+        sphinx/livingstandards.rst \
+        sphinx/make.bat \
+        sphinx/man_developers \
+        sphinx/man_users \
+        sphinx/preface.rst \
+        sphinx/_static
+
+