commit a7ef5946befb435e6d06dffcc1c1256f8f8e1c78
parent 4cffc642c431831319eda9f4ca571f0c6e2e4a75
Author: Martin Schanzenbach <mschanzenbach@posteo.de>
Date: Sun, 28 Feb 2021 14:41:12 +0100
-build: revert AM_MAKEINFOHTMLFLAGS redefine. guess we have to live with the warning.
Diffstat:
3 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -1,25 +1,5 @@
# 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
diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am
@@ -3,6 +3,26 @@ 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 = --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
@@ -1,6 +1,26 @@
# 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 \
