diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2021-02-28 13:51:25 +0100 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2021-02-28 13:51:25 +0100 |
commit | 4cffc642c431831319eda9f4ca571f0c6e2e4a75 (patch) | |
tree | c116ffed24e8550f198c0178d938ada7704bb73e | |
parent | ae334ebbc55e1b6ed94ea978a0ef0fd9fe5d461f (diff) | |
download | gnunet-4cffc642c431831319eda9f4ca571f0c6e2e4a75.tar.gz gnunet-4cffc642c431831319eda9f4ca571f0c6e2e4a75.zip |
build: do not redefine AM_MAKEINFOHTMLFLAGS
-rw-r--r-- | doc/Makefile.am | 22 | ||||
-rw-r--r-- | doc/handbook/Makefile.am | 20 | ||||
-rw-r--r-- | 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 @@ | |||
1 | # This Makefile.am is in the public domain | 1 | # This Makefile.am is in the public domain |
2 | |||
3 | if ACTIVATE_TEXINFO4 | ||
4 | # NOTE: While GNU makeinfo 6.5 supports --css-ref=URL, | ||
5 | # makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other | ||
6 | # base) does only support --css-include=FILE. | ||
7 | # The only difference is a shorter html output and | ||
8 | # in 6.5 the ability to use refs instead of include. | ||
9 | # We prefer not to break builds in this case, so | ||
10 | # we use the include version which is backwards compatible | ||
11 | # and upwards compatible, while the ref variant is neither. | ||
12 | AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css | ||
13 | else | ||
14 | # In the 5.x version they added `--split=chapters|sections` in | ||
15 | # addition to `--split=nodes`. | ||
16 | # Hold on to your hats: In version 6.5 this is already removed, ffs. | ||
17 | # GNU Texinfo, please be more consistent than 1 version in switches. | ||
18 | # This however is compatible to version 5.2. Thanks, I hate it. | ||
19 | # AM_MAKEINFOHTMLFLAGS = --split=sections --css-ref="../style.css" --css-ref="../manual.css" | ||
20 | AM_MAKEINFOHTMLFLAGS = --split --css-ref="../style.css" --css-ref="../manual.css" | ||
21 | endif | ||
22 | |||
23 | |||
2 | if DOCUMENTATION | 24 | if DOCUMENTATION |
3 | SUBDIRS = doxygen handbook tutorial | 25 | SUBDIRS = doxygen handbook tutorial |
4 | endif | 26 | 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/ | |||
3 | 3 | ||
4 | infoimagedir = $(infodir)/images | 4 | infoimagedir = $(infodir)/images |
5 | 5 | ||
6 | if ACTIVATE_TEXINFO4 | ||
7 | # NOTE: While GNU makeinfo 6.5 supports --css-ref=URL, | ||
8 | # makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other | ||
9 | # base) does only support --css-include=FILE. | ||
10 | # The only difference is a shorter html output and | ||
11 | # in 6.5 the ability to use refs instead of include. | ||
12 | # We prefer not to break builds in this case, so | ||
13 | # we use the include version which is backwards compatible | ||
14 | # and upwards compatible, while the ref variant is neither. | ||
15 | AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css | ||
16 | else | ||
17 | # In the 5.x version they added `--split=chapters|sections` in | ||
18 | # addition to `--split=nodes`. | ||
19 | # Hold on to your hats: In version 6.5 this is already removed, ffs. | ||
20 | # GNU Texinfo, please be more consistent than 1 version in switches. | ||
21 | # This however is compatible to version 5.2. Thanks, I hate it. | ||
22 | # AM_MAKEINFOHTMLFLAGS = --split=sections --css-ref="../style.css" --css-ref="../manual.css" | ||
23 | AM_MAKEINFOHTMLFLAGS = --no-split --css-ref="../style.css" --css-ref="../manual.css" | ||
24 | endif | ||
25 | |||
26 | dist_infoimage_DATA = \ | 6 | dist_infoimage_DATA = \ |
27 | images/gnunet-gtk-0-10-gns-a-done.png \ | 7 | images/gnunet-gtk-0-10-gns-a-done.png \ |
28 | images/gnunet-gtk-0-10-gns-a.png \ | 8 | 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 @@ | |||
1 | # This Makefile.am is in the public domain | 1 | # This Makefile.am is in the public domain |
2 | docdir = $(datadir)/doc/gnunet/ | 2 | docdir = $(datadir)/doc/gnunet/ |
3 | 3 | ||
4 | if ACTIVATE_TEXINFO4 | ||
5 | # NOTE: While GNU makeinfo 6.5 supports --css-ref=URL, | ||
6 | # makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other | ||
7 | # base) does only support --css-include=FILE. | ||
8 | # The only difference is a shorter html output and | ||
9 | # in 6.5 the ability to use refs instead of include. | ||
10 | # We prefer not to break builds in this case, so | ||
11 | # we use the include version which is backwards compatible | ||
12 | # and upwards compatible, while the ref variant is neither. | ||
13 | AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css | ||
14 | else | ||
15 | # In the 5.x version they added `--split=chapters|sections` in | ||
16 | # addition to `--split=nodes`. | ||
17 | # Hold on to your hats: In version 6.5 this is already removed, ffs. | ||
18 | # GNU Texinfo, please be more consistent than 1 version in switches. | ||
19 | # This however is compatible to version 5.2. Thanks, I hate it. | ||
20 | # AM_MAKEINFOHTMLFLAGS = --split=sections --css-ref="../style.css" --css-ref="../manual.css" | ||
21 | AM_MAKEINFOHTMLFLAGS = --split --css-ref="../style.css" --css-ref="../manual.css" | ||
22 | endif | ||
23 | 4 | ||
24 | gnunet_tutorial_examples = \ | 5 | gnunet_tutorial_examples = \ |
25 | examples/001.c \ | 6 | examples/001.c \ |