aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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
1288contrib/scripts/gnunet-logread/Makefile 1288contrib/scripts/gnunet-logread/Makefile
1289doc/Makefile 1289doc/Makefile
1290doc/man/Makefile 1290doc/man/Makefile
1291doc/sphinx/Makefile
1292doc/doxygen/Makefile 1291doc/doxygen/Makefile
1293m4/Makefile 1292m4/Makefile
1294po/Makefile.in 1293po/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 @@
2 2
3 3
4if DOCUMENTATION 4if DOCUMENTATION
5 SUBDIRS = doxygen sphinx 5 SUBDIRS = doxygen
6all-local:
7 cd sphinx && make html
8
9install-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
6if INCLUDE_MANPAGES 16if INCLUDE_MANPAGES
17man_MANS = sphinx/_build/man/gnunet.1
7 SUBDIRS += man 18 SUBDIRS += man
8endif 19endif
9endif 20endif
10 21
11EXTRA_DIST = \ 22EXTRA_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