summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2022-08-07 14:56:57 +0200
committerMartin Schanzenbach <schanzen@gnunet.org>2022-08-07 14:56:57 +0200
commit5bd9870c830b8f7c1d3dd7b3f531c5fd3acd3f0c (patch)
treecb369679f3c97b307b13ed971b002d19707127bc
parent4053d79016cec6ea2e0c7502622c0afea340d7ab (diff)
-update submodule; properly integrate with build and install !release
-rw-r--r--configure.ac1
-rw-r--r--doc/Makefile.am30
m---------doc/sphinx0
3 files changed, 28 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index d4fa88306..60ff7e4b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1288,7 +1288,6 @@ contrib/scripts/Makefile
contrib/scripts/gnunet-logread/Makefile
doc/Makefile
doc/man/Makefile
-doc/sphinx/Makefile
doc/doxygen/Makefile
m4/Makefile
po/Makefile.in
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
-Subproject be118c2920f5d3f597981b5da0f60d1443ff16a
+Subproject c8cb9262ba1102b2cad457f38108fce2fd412ed