[gnunet] branch master updated: - fix

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 0a968728d - fix
0a968728d is described below

commit 0a968728de260c1206f34c5a992ab689fe9b2de5
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sat Oct 1 22:03:03 2022 +0900

    - fix
---
 doc/Makefile.am     | 35 ++++++++++-------------------------
 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 @@
 # It only supports building the documentation (and cleanup).
 # So, the only targets used are "make (all)" and "make clean".
 # Actuall installation of manpages/docs is done below
+# Also, the manpages are handled in man/, but some of them are built using
+# sphinx in all-local
 
-SUBDIRS = sphinx .
+SUBDIRS = .
 
 if HAVE_DOXY_BINARY
   SUBDIRS += doxygen
 endif
 
-install-data-hook: sphinx
+all-local:
+       cd sphinx && make all
+
+clean-local:
+       cd sphinx && make clean
+
+install-data-hook:
        mkdir -p $(DESTDIR)$(docdir)
        cp -pr sphinx/_build/html $(DESTDIR)$(docdir)
        mkdir -p $(DESTDIR)$(infodir)
        cp -pr sphinx/_build/texinfo/gnunet.info $(DESTDIR)$(infodir)
 
 if INCLUDE_MANPAGES
-man_MANS = \
-       sphinx/_build/man/gnunet.1 \
-       sphinx/_build/man/gnunet.2 \
-       sphinx/_build/man/gnunet.3 \
-       sphinx/_build/man/gnunet.4 \
-       sphinx/_build/man/gnunet.5 \
-       sphinx/_build/man/gnunet.6 \
-       sphinx/_build/man/gnunet.7 \
-       sphinx/_build/man/gnunet.8 \
-       sphinx/_build/man/gnunet.9 \
-       sphinx/_build/man/gana.1 \
-       sphinx/_build/man/gana.2 \
-       sphinx/_build/man/gana.3 \
-       sphinx/_build/man/gana.4 \
-       sphinx/_build/man/gana.5 \
-       sphinx/_build/man/gnunet-dev.1 \
-       sphinx/_build/man/gnunet-dev.2 \
-       sphinx/_build/man/gnunet-dev.3 \
-       sphinx/_build/man/gnunet-dev.4 \
-       sphinx/_build/man/gnunet-dev.5 \
-       sphinx/_build/man/gnunet-dev.6 \
-       sphinx/_build/man/lsd.1
 SUBDIRS += man
 endif
 
@@ -54,7 +40,6 @@ endif
 #  sphinx/_build/texinfo/gnunet.texi
 
 EXTRA_DIST = \
-       $(man_MANS) \
        sphinx/_build/texinfo/gnunet.info \
        system_specific/outdated-and-old-installation-instructions.txt \
        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
 endif
 
 man_MANS = \
+  ../sphinx/_build/man/gnunet.1 \
+       ../sphinx/_build/man/gnunet.2 \
+       ../sphinx/_build/man/gnunet.3 \
+       ../sphinx/_build/man/gnunet.4 \
+       ../sphinx/_build/man/gnunet.5 \
+       ../sphinx/_build/man/gnunet.6 \
+       ../sphinx/_build/man/gnunet.7 \
+       ../sphinx/_build/man/gnunet.8 \
+       ../sphinx/_build/man/gnunet.9 \
+       ../sphinx/_build/man/gana.1 \
+       ../sphinx/_build/man/gana.2 \
+       ../sphinx/_build/man/gana.3 \
+       ../sphinx/_build/man/gana.4 \
+       ../sphinx/_build/man/gana.5 \
+       ../sphinx/_build/man/gnunet-dev.1 \
+       ../sphinx/_build/man/gnunet-dev.2 \
+       ../sphinx/_build/man/gnunet-dev.3 \
+       ../sphinx/_build/man/gnunet-dev.4 \
+       ../sphinx/_build/man/gnunet-dev.5 \
+       ../sphinx/_build/man/gnunet-dev.6 \
+       ../sphinx/_build/man/lsd.1 \
   gnunet.conf.5 \
   gnunet-arm.1 \
   gnunet-ats.1 \

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.