gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnunet] branch master updated: -fix installation of gnunet.info


From: gnunet
Subject: [gnunet] branch master updated: -fix installation of gnunet.info
Date: Sat, 24 Sep 2022 12:22:15 +0200

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

grothoff pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 6a9f60421 -fix installation of gnunet.info
6a9f60421 is described below

commit 6a9f604210b55eb75545eb6423c89093ec5417c5
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Sep 24 12:22:07 2022 +0200

    -fix installation of gnunet.info
---
 bootstrap       |  8 ++++++++
 doc/Makefile.am | 16 +++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/bootstrap b/bootstrap
index 96c0f7196..cee9a1ff7 100755
--- a/bootstrap
+++ b/bootstrap
@@ -87,6 +87,13 @@ check_libtool()
     fi
 }
 
+sphinx ()
+{
+    # Bootstrap Sphinx documentation
+    cd doc/sphinx; make man info ; cd -
+}
+
+
 submodules()
 {
     # Try to update the submodule. Since bootstrap
@@ -142,6 +149,7 @@ main()
     gana_update
     check_uncrustify
     check_yapf
+    sphinx
     check_libtool
 }
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f4a0e4dcd..e56d53322 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,8 +1,7 @@
 # This Makefile.am is in the public domain
 
-
 if DOCUMENTATION
-  SUBDIRS = doxygen
+  SUBDIRS = . doxygen
 all-local:
        cd sphinx && make html
 
@@ -10,17 +9,18 @@ install-data-hook:
        mkdir -p $(DESTDIR)$(docdir)
        cp -pr sphinx/_build/html $(DESTDIR)$(docdir)
 
-sphinx/_build/man/gnunet.1: Makefile
-       cd sphinx && make man
-
 if INCLUDE_MANPAGES
-# FIXME this is somehow broken on openbsd. See #7324
 man_MANS = sphinx/_build/man/gnunet.1
 SUBDIRS += man
 endif
 endif
 
-EXTRA_DIST =                                                   \
+info_TEXINFOS = \
+  sphinx/_build/texinfo/gnunet.texi
+
+EXTRA_DIST = \
+    sphinx/_build/man/gnunet.1 \
+    sphinx/_build/texinfo/gnunet.texinfo \
        system_specific/outdated-and-old-installation-instructions.txt \
        system_specific/FROM_SOURCE \
        sphinx/about.rst \
@@ -37,5 +37,3 @@ EXTRA_DIST =                                                  
\
        sphinx/preface.rst \
        sphinx/_static \
        sphinx/Makefile
-
-

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]