1 files changed, 24 insertions, 26 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 84e7e5fbd..b45362d38 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,39 +1,37 @@
 # This Makefile.am is in the public domain
 
+SUBDIRS = .
 
-if DOCUMENTATION
-  SUBDIRS = doxygen
+if HAVE_DOXY_BINARY
+  SUBDIRS += doxygen
+endif
+
+# OpenBSD is a bit iffy wrt sphinx make info
+if OPENBSD
 all-local:
-        cd sphinx && make html
+        cd handbook/texinfo && make || touch gnunet.info
+GNUNET_TEXI =
+else
+GNUNET_TEXI = handbook/texinfo/gnunet.texi
+endif
 
 install-data-hook:
         mkdir -p $(DESTDIR)$(docdir)
-        cp -pr sphinx/_build/html $(DESTDIR)$(docdir)
-
-_build/man/gnunet.1: Makefile
-        cd sphinx && make man
+        cp -pr handbook/html $(DESTDIR)$(docdir)
+        mkdir -p $(DESTDIR)$(infodir)
+        cp -pr handbook/texinfo/gnunet.info $(DESTDIR)$(infodir)
 
 if INCLUDE_MANPAGES
-man_MANS = sphinx/_build/man/gnunet.1
-  SUBDIRS += man
-endif
+SUBDIRS += man
 endif
 
-EXTRA_DIST =                                                    \
-        system_specific/outdated-and-old-installation-instructions.txt \
-        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
+AM_MAKEINFOFLAGS = --no-headers --no-split
 
+info_TEXINFOS = \
+  $(GNUNET_TEXI)
 
+EXTRA_DIST = \
+        handbook/texinfo \
+        system_specific/outdated-and-old-installation-instructions.txt \
+        system_specific/FROM_SOURCE \
+        handbook/html