diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2022-10-01 22:03:03 +0900 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2022-10-01 22:03:03 +0900 |
commit | 0a968728de260c1206f34c5a992ab689fe9b2de5 (patch) | |
tree | c012a51a50fe79b231ec30cb8d1a3866a0fbb53e | |
parent | 68dbb331f7e49e5ab8809e1ccf4daaacabd79013 (diff) | |
download | gnunet-0a968728de260c1206f34c5a992ab689fe9b2de5.tar.gz gnunet-0a968728de260c1206f34c5a992ab689fe9b2de5.zip |
- fix
-rw-r--r-- | doc/Makefile.am | 35 | ||||
-rw-r--r-- | doc/man/Makefile.am | 21 |
2 files changed, 31 insertions, 25 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 20eebaf30..c4e5671bb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am | |||
@@ -5,42 +5,28 @@ | |||
5 | # It only supports building the documentation (and cleanup). | 5 | # It only supports building the documentation (and cleanup). |
6 | # So, the only targets used are "make (all)" and "make clean". | 6 | # So, the only targets used are "make (all)" and "make clean". |
7 | # Actuall installation of manpages/docs is done below | 7 | # Actuall installation of manpages/docs is done below |
8 | # Also, the manpages are handled in man/, but some of them are built using | ||
9 | # sphinx in all-local | ||
8 | 10 | ||
9 | SUBDIRS = sphinx . | 11 | SUBDIRS = . |
10 | 12 | ||
11 | if HAVE_DOXY_BINARY | 13 | if HAVE_DOXY_BINARY |
12 | SUBDIRS += doxygen | 14 | SUBDIRS += doxygen |
13 | endif | 15 | endif |
14 | 16 | ||
15 | install-data-hook: sphinx | 17 | all-local: |
18 | cd sphinx && make all | ||
19 | |||
20 | clean-local: | ||
21 | cd sphinx && make clean | ||
22 | |||
23 | install-data-hook: | ||
16 | mkdir -p $(DESTDIR)$(docdir) | 24 | mkdir -p $(DESTDIR)$(docdir) |
17 | cp -pr sphinx/_build/html $(DESTDIR)$(docdir) | 25 | cp -pr sphinx/_build/html $(DESTDIR)$(docdir) |
18 | mkdir -p $(DESTDIR)$(infodir) | 26 | mkdir -p $(DESTDIR)$(infodir) |
19 | cp -pr sphinx/_build/texinfo/gnunet.info $(DESTDIR)$(infodir) | 27 | cp -pr sphinx/_build/texinfo/gnunet.info $(DESTDIR)$(infodir) |
20 | 28 | ||
21 | if INCLUDE_MANPAGES | 29 | if INCLUDE_MANPAGES |
22 | man_MANS = \ | ||
23 | sphinx/_build/man/gnunet.1 \ | ||
24 | sphinx/_build/man/gnunet.2 \ | ||
25 | sphinx/_build/man/gnunet.3 \ | ||
26 | sphinx/_build/man/gnunet.4 \ | ||
27 | sphinx/_build/man/gnunet.5 \ | ||
28 | sphinx/_build/man/gnunet.6 \ | ||
29 | sphinx/_build/man/gnunet.7 \ | ||
30 | sphinx/_build/man/gnunet.8 \ | ||
31 | sphinx/_build/man/gnunet.9 \ | ||
32 | sphinx/_build/man/gana.1 \ | ||
33 | sphinx/_build/man/gana.2 \ | ||
34 | sphinx/_build/man/gana.3 \ | ||
35 | sphinx/_build/man/gana.4 \ | ||
36 | sphinx/_build/man/gana.5 \ | ||
37 | sphinx/_build/man/gnunet-dev.1 \ | ||
38 | sphinx/_build/man/gnunet-dev.2 \ | ||
39 | sphinx/_build/man/gnunet-dev.3 \ | ||
40 | sphinx/_build/man/gnunet-dev.4 \ | ||
41 | sphinx/_build/man/gnunet-dev.5 \ | ||
42 | sphinx/_build/man/gnunet-dev.6 \ | ||
43 | sphinx/_build/man/lsd.1 | ||
44 | SUBDIRS += man | 30 | SUBDIRS += man |
45 | endif | 31 | endif |
46 | 32 | ||
@@ -54,7 +40,6 @@ endif | |||
54 | # sphinx/_build/texinfo/gnunet.texi | 40 | # sphinx/_build/texinfo/gnunet.texi |
55 | 41 | ||
56 | EXTRA_DIST = \ | 42 | EXTRA_DIST = \ |
57 | $(man_MANS) \ | ||
58 | sphinx/_build/texinfo/gnunet.info \ | 43 | sphinx/_build/texinfo/gnunet.info \ |
59 | system_specific/outdated-and-old-installation-instructions.txt \ | 44 | system_specific/outdated-and-old-installation-instructions.txt \ |
60 | system_specific/FROM_SOURCE \ | 45 | system_specific/FROM_SOURCE \ |
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index af781bba4..262441e9d 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am | |||
@@ -36,6 +36,27 @@ endif | |||
36 | endif | 36 | endif |
37 | 37 | ||
38 | man_MANS = \ | 38 | man_MANS = \ |
39 | ../sphinx/_build/man/gnunet.1 \ | ||
40 | ../sphinx/_build/man/gnunet.2 \ | ||
41 | ../sphinx/_build/man/gnunet.3 \ | ||
42 | ../sphinx/_build/man/gnunet.4 \ | ||
43 | ../sphinx/_build/man/gnunet.5 \ | ||
44 | ../sphinx/_build/man/gnunet.6 \ | ||
45 | ../sphinx/_build/man/gnunet.7 \ | ||
46 | ../sphinx/_build/man/gnunet.8 \ | ||
47 | ../sphinx/_build/man/gnunet.9 \ | ||
48 | ../sphinx/_build/man/gana.1 \ | ||
49 | ../sphinx/_build/man/gana.2 \ | ||
50 | ../sphinx/_build/man/gana.3 \ | ||
51 | ../sphinx/_build/man/gana.4 \ | ||
52 | ../sphinx/_build/man/gana.5 \ | ||
53 | ../sphinx/_build/man/gnunet-dev.1 \ | ||
54 | ../sphinx/_build/man/gnunet-dev.2 \ | ||
55 | ../sphinx/_build/man/gnunet-dev.3 \ | ||
56 | ../sphinx/_build/man/gnunet-dev.4 \ | ||
57 | ../sphinx/_build/man/gnunet-dev.5 \ | ||
58 | ../sphinx/_build/man/gnunet-dev.6 \ | ||
59 | ../sphinx/_build/man/lsd.1 \ | ||
39 | gnunet.conf.5 \ | 60 | gnunet.conf.5 \ |
40 | gnunet-arm.1 \ | 61 | gnunet-arm.1 \ |
41 | gnunet-ats.1 \ | 62 | gnunet-ats.1 \ |