From 5bd9870c830b8f7c1d3dd7b3f531c5fd3acd3f0c Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Sun, 7 Aug 2022 14:56:57 +0200 Subject: -update submodule; properly integrate with build and install !release --- doc/Makefile.am | 30 ++++++++++++++++++++++++++++-- doc/sphinx | 2 +- 2 files changed, 29 insertions(+), 3 deletions(-) (limited to 'doc') 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 + + diff --git a/doc/sphinx b/doc/sphinx index be118c292..c8cb9262b 160000 --- a/doc/sphinx +++ b/doc/sphinx @@ -1 +1 @@ -Subproject commit be118c2920f5d3f597981b5da0f60d1443ff16a6 +Subproject commit c8cb9262ba1102b2cad457f38108fce2fd412ed2 -- cgit v1.2.3