diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2021-02-28 15:26:11 +0100 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2021-02-28 15:26:11 +0100 |
commit | c666bf95d0ba0a6eddcf0e6953b05ef375f6a75e (patch) | |
tree | cbfd1f50c55446f24f06ad1979b6b04b59689bff /doc/handbook | |
parent | a7ef5946befb435e6d06dffcc1c1256f8f8e1c78 (diff) | |
download | gnunet-c666bf95d0ba0a6eddcf0e6953b05ef375f6a75e.tar.gz gnunet-c666bf95d0ba0a6eddcf0e6953b05ef375f6a75e.zip |
-another try. properly handle autoconf vs configure for HTMLFLAGS
Diffstat (limited to 'doc/handbook')
-rw-r--r-- | doc/handbook/Makefile.am | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am index 4597d9a3d..d7bcab696 100644 --- a/doc/handbook/Makefile.am +++ b/doc/handbook/Makefile.am | |||
@@ -3,25 +3,8 @@ docdir = $(datadir)/doc/gnunet/ | |||
3 | 3 | ||
4 | infoimagedir = $(infodir)/images | 4 | infoimagedir = $(infodir)/images |
5 | 5 | ||
6 | if ACTIVATE_TEXINFO4 | 6 | AM_MAKEINFOHTMLFLAGS = $(TEXINFO_HTMLFLAGS) |
7 | # NOTE: While GNU makeinfo 6.5 supports --css-ref=URL, | 7 | |
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 = --split --css-ref="../style.css" --css-ref="../manual.css" | ||
24 | endif | ||
25 | 8 | ||
26 | dist_infoimage_DATA = \ | 9 | dist_infoimage_DATA = \ |
27 | images/gnunet-gtk-0-10-gns-a-done.png \ | 10 | images/gnunet-gtk-0-10-gns-a-done.png \ |
@@ -78,6 +61,25 @@ gnunet_TEXINFOS = \ | |||
78 | agpl-3.0.texi \ | 61 | agpl-3.0.texi \ |
79 | version.texi | 62 | version.texi |
80 | 63 | ||
64 | #if ACTIVATE_TEXINFO4 | ||
65 | # NOTE: While GNU makeinfo 6.5 supports --css-ref=URL, | ||
66 | # makeinfo 4.8 (in NetBSD 8.0, macOS, and maybe other | ||
67 | # base) does only support --css-include=FILE. | ||
68 | # The only difference is a shorter html output and | ||
69 | # in 6.5 the ability to use refs instead of include. | ||
70 | # We prefer not to break builds in this case, so | ||
71 | # we use the include version which is backwards compatible | ||
72 | # and upwards compatible, while the ref variant is neither. | ||
73 | #AM_MAKEINFOHTMLFLAGS = --no-split --css-include=style.css --css-include=manual.css | ||
74 | #else | ||
75 | # In the 5.x version they added `--split=chapters|sections` in | ||
76 | # addition to `--split=nodes`. | ||
77 | # Hold on to your hats: In version 6.5 this is already removed, ffs. | ||
78 | # GNU Texinfo, please be more consistent than 1 version in switches. | ||
79 | # This however is compatible to version 5.2. Thanks, I hate it. | ||
80 | # AM_MAKEINFOHTMLFLAGS = --split=sections --css-ref="../style.css" --css-ref="../manual.css" | ||
81 | #AM_MAKEINFOHTMLFLAGS = --split --css-ref="../style.css" --css-ref="../manual.css" | ||
82 | #endif | ||
81 | EXTRA_DIST = \ | 83 | EXTRA_DIST = \ |
82 | $(gnunet_TEXINFOS) \ | 84 | $(gnunet_TEXINFOS) \ |
83 | htmlxref.cnf \ | 85 | htmlxref.cnf \ |