aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-04-01 18:00:45 +0000
committerng0 <ng0@n0.is>2019-04-01 18:00:45 +0000
commit1d17d1aa2e32586ac07f637ad320b05a56cc1e3c (patch)
treee030be42a89ae6f1b0c7b1651ebbf0778cbe1763 /doc
parent9662ba32e6b383fc7033f5aceb070ee49ec39d09 (diff)
parent8e50f39a2c1ba03011bd1e5c51d0721f220e2e7a (diff)
downloadgnunet-1d17d1aa2e32586ac07f637ad320b05a56cc1e3c.tar.gz
gnunet-1d17d1aa2e32586ac07f637ad320b05a56cc1e3c.zip
Merge branch 'dev/ng0/5673_5616'
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am9
1 files changed, 7 insertions, 2 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4443b42f8..eb23b534b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,14 @@
1# This Makefile.am is in the public domain 1# This Makefile.am is in the public domain
2if DOCUMENTATION 2if DOCUMENTATION
3 SUBDIRS = man doxygen handbook tutorial 3 SUBDIRS = doxygen handbook tutorial
4endif 4endif
5
5if !DOCUMENTATION 6if !DOCUMENTATION
6 SUBDIRS = man doxygen 7 SUBDIRS = doxygen
8endif
9
10if INCLUDE_MANPAGES
11 SUBDIRS += man
7endif 12endif
8 13
9EXTRA_DIST = \ 14EXTRA_DIST = \