diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2022-08-07 14:56:57 +0200 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2022-08-07 14:56:57 +0200 |
commit | 5bd9870c830b8f7c1d3dd7b3f531c5fd3acd3f0c (patch) | |
tree | cb369679f3c97b307b13ed971b002d19707127bc /doc | |
parent | 4053d79016cec6ea2e0c7502622c0afea340d7ab (diff) | |
download | gnunet-5bd9870c830b8f7c1d3dd7b3f531c5fd3acd3f0c.tar.gz gnunet-5bd9870c830b8f7c1d3dd7b3f531c5fd3acd3f0c.zip |
-update submodule; properly integrate with build and install !release
Diffstat (limited to 'doc')
-rw-r--r-- | doc/Makefile.am | 30 | ||||
m--------- | doc/sphinx | 0 |
2 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 @@ | |||
2 | 2 | ||
3 | 3 | ||
4 | if DOCUMENTATION | 4 | if DOCUMENTATION |
5 | SUBDIRS = doxygen sphinx | 5 | SUBDIRS = doxygen |
6 | all-local: | ||
7 | cd sphinx && make html | ||
8 | |||
9 | install-data-hook: | ||
10 | mkdir -p $(DESTDIR)$(docdir) | ||
11 | cp -pr sphinx/_build/html $(DESTDIR)$(docdir) | ||
12 | |||
13 | _build/man/gnunet.1: Makefile | ||
14 | cd sphinx && make man | ||
15 | |||
6 | if INCLUDE_MANPAGES | 16 | if INCLUDE_MANPAGES |
17 | man_MANS = sphinx/_build/man/gnunet.1 | ||
7 | SUBDIRS += man | 18 | SUBDIRS += man |
8 | endif | 19 | endif |
9 | endif | 20 | endif |
10 | 21 | ||
11 | EXTRA_DIST = \ | 22 | EXTRA_DIST = \ |
12 | system_specific/outdated-and-old-installation-instructions.txt \ | 23 | system_specific/outdated-and-old-installation-instructions.txt \ |
13 | system_specific/FROM_SOURCE | 24 | system_specific/FROM_SOURCE \ |
25 | sphinx/about.rst \ | ||
26 | sphinx/conf.py \ | ||
27 | sphinx/faq.rst \ | ||
28 | sphinx/gana.rst \ | ||
29 | sphinx/guis \ | ||
30 | sphinx/index.rst \ | ||
31 | sphinx/installing.rst \ | ||
32 | sphinx/livingstandards.rst \ | ||
33 | sphinx/make.bat \ | ||
34 | sphinx/man_developers \ | ||
35 | sphinx/man_users \ | ||
36 | sphinx/preface.rst \ | ||
37 | sphinx/_static | ||
38 | |||
39 | |||
diff --git a/doc/sphinx b/doc/sphinx | |||
Subproject be118c2920f5d3f597981b5da0f60d1443ff16a | Subproject c8cb9262ba1102b2cad457f38108fce2fd412ed | ||