[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: BUILD: Improve documentation build
From: |
gnunet |
Subject: |
[gnunet] branch master updated: BUILD: Improve documentation build |
Date: |
Tue, 27 Sep 2022 04:26:15 +0200 |
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 a3c972882 BUILD: Improve documentation build
a3c972882 is described below
commit a3c9728827920f6cfe230f816a29a80aa72d3c91
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Tue Sep 27 11:26:06 2022 +0900
BUILD: Improve documentation build
---
bootstrap | 8 --------
doc/Makefile.am | 32 ++++++++++++++++++++++++++------
2 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/bootstrap b/bootstrap
index 3fa6e67ad..96c0f7196 100755
--- a/bootstrap
+++ b/bootstrap
@@ -87,13 +87,6 @@ check_libtool()
fi
}
-sphinx ()
-{
- # Bootstrap Sphinx documentation
- cd doc/sphinx; make man info html >/dev/null; cd -
-}
-
-
submodules()
{
# Try to update the submodule. Since bootstrap
@@ -149,7 +142,6 @@ main()
gana_update
check_uncrustify
check_yapf
- sphinx
check_libtool
}
diff --git a/doc/Makefile.am b/doc/Makefile.am
index dbaa51d39..eb0998954 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -6,24 +6,44 @@ if HAVE_DOXY_BINARY
SUBDIRS += doxygen
endif
-sphinx: Makefile
- cd sphinx && make html man info
+sphinx/_build/texinfo/gnunet.info:
+ cd sphinx && make info
-install-data-hook:
+sphinx/_build/html:
+ cd sphinx && make html
+
+sphinx: sphinx/_build/texinfo/gnunet.info sphinx/_build/html
+ cd sphinx && make html info
+
+install-data-hook: sphinx
mkdir -p $(DESTDIR)$(docdir)
cp -pr sphinx/_build/html $(DESTDIR)$(docdir)
+ mkdir -p $(DESTDIR)$(infodir)
+ cp -pr sphinx/_build/texinfo/gnunet.info $(DESTDIR)$(infodir)
+
+clean-local:
+ cd sphinx && make clean
+
+sphinx/_build/man/gnunet.1:
+ cd sphinx && make man
if INCLUDE_MANPAGES
man_MANS = sphinx/_build/man/gnunet.1
SUBDIRS += man
endif
-info_TEXINFOS = \
- sphinx/_build/texinfo/gnunet.texi
+# NOTE: We cannot make this conditional because automake
+# This means that if documentation is built, you MUST also build texinfos
+# and need makeinfo.
+# And yes, sphinx already compiled texi->info at this point and this will
+# re-create it.
+# So, we now manually copy it above in the install-data-hook
+#info_TEXINFOS = \
+# sphinx/_build/texinfo/gnunet.texi
EXTRA_DIST = \
$(man_MANS) \
- $(info_TEXINFOS) \
+ sphinx/_build/texinfo \
system_specific/outdated-and-old-installation-instructions.txt \
system_specific/FROM_SOURCE \
sphinx/_build/html \
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: BUILD: Improve documentation build,
gnunet <=