[gnunet] branch master updated: build: do not redefine AM_MAKEINFOHTMLFLAGS

[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 4cffc642c build: do not redefine AM_MAKEINFOHTMLFLAGS
4cffc642c is described below

commit 4cffc642c431831319eda9f4ca571f0c6e2e4a75
Author: Martin Schanzenbach <mschanzenbach@posteo.de>
AuthorDate: Sun Feb 28 13:51:25 2021 +0100

    build: do not redefine AM_MAKEINFOHTMLFLAGS
---
 doc/Makefile.am          | 22 ++++++++++++++++++++++
 doc/handbook/Makefile.am | 20 --------------------
 doc/tutorial/Makefile.am | 19 -------------------
 3 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index eb23b534b..5f8c2b6d0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,26 @@
 # This Makefile.am is in the public domain
+
+if ACTIVATE_TEXINFO4
+# NOTE: While GNU makeinfo 6.5 supports --css-ref=URL,
+# makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other
+# base) does only support --css-include=FILE.
+# The only difference is a shorter html output and
+# in 6.5 the ability to use refs instead of include.
+# We prefer not to break builds in this case, so
+# we use the include version which is backwards compatible
+# and upwards compatible, while the ref variant is neither.
+AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css 
--css-include=manual.css
+else
+# In the 5.x version they added `--split=chapters|sections` in
+# addition to `--split=nodes`.
+# Hold on to your hats: In version 6.5 this is already removed, ffs.
+# GNU Texinfo, please be more consistent than 1 version in switches.
+# This however is compatible to version 5.2. Thanks, I hate it.
+# AM_MAKEINFOHTMLFLAGS = --split=sections --css-ref="../style.css" 
--css-ref="../manual.css"
+AM_MAKEINFOHTMLFLAGS = --split --css-ref="../style.css" 
--css-ref="../manual.css"
+endif
+
+
 if DOCUMENTATION
   SUBDIRS = doxygen handbook tutorial
 endif
diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am
index 0435796a9..e4a1808c9 100644
--- a/doc/handbook/Makefile.am
+++ b/doc/handbook/Makefile.am
@@ -3,26 +3,6 @@ docdir = $(datadir)/doc/gnunet/
 
 infoimagedir = $(infodir)/images
 
-if ACTIVATE_TEXINFO4
-# NOTE: While GNU makeinfo 6.5 supports --css-ref=URL,
-# makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other
-# base) does only support --css-include=FILE.
-# The only difference is a shorter html output and
-# in 6.5 the ability to use refs instead of include.
-# We prefer not to break builds in this case, so
-# we use the include version which is backwards compatible
-# and upwards compatible, while the ref variant is neither.
-AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css 
--css-include=manual.css
-else
-# In the 5.x version they added `--split=chapters|sections` in
-# addition to `--split=nodes`.
-# Hold on to your hats: In version 6.5 this is already removed, ffs.
-# GNU Texinfo, please be more consistent than 1 version in switches.
-# This however is compatible to version 5.2. Thanks, I hate it.
-# AM_MAKEINFOHTMLFLAGS = --split=sections --css-ref="../style.css" 
--css-ref="../manual.css"
-AM_MAKEINFOHTMLFLAGS = --no-split --css-ref="../style.css" 
--css-ref="../manual.css"
-endif
-
 dist_infoimage_DATA =                                          \
        images/gnunet-gtk-0-10-gns-a-done.png                   \
        images/gnunet-gtk-0-10-gns-a.png                        \
diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index d0307ecb5..516e6b4c1 100644
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -1,25 +1,6 @@
 # This Makefile.am is in the public domain
 docdir = $(datadir)/doc/gnunet/
 
-if ACTIVATE_TEXINFO4
-# NOTE: While GNU makeinfo 6.5 supports --css-ref=URL,
-# makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other
-# base) does only support --css-include=FILE.
-# The only difference is a shorter html output and
-# in 6.5 the ability to use refs instead of include.
-# We prefer not to break builds in this case, so
-# we use the include version which is backwards compatible
-# and upwards compatible, while the ref variant is neither.
-AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css 
--css-include=manual.css
-else
-# In the 5.x version they added `--split=chapters|sections` in
-# addition to `--split=nodes`.
-# Hold on to your hats: In version 6.5 this is already removed, ffs.
-# GNU Texinfo, please be more consistent than 1 version in switches.
-# This however is compatible to version 5.2. Thanks, I hate it.
-# AM_MAKEINFOHTMLFLAGS = --split=sections --css-ref="../style.css" 
--css-ref="../manual.css"
-AM_MAKEINFOHTMLFLAGS = --split --css-ref="../style.css" 
--css-ref="../manual.css"
-endif
 
 gnunet_tutorial_examples =                                     \
        examples/001.c                                                  \

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