diff options
| author | Bernhard Voelker <mail@bernhard-voelker.de> | 2022-11-16 00:54:05 +0100 |
|---|---|---|
| committer | Bernhard Voelker <mail@bernhard-voelker.de> | 2022-11-16 01:12:40 +0100 |
| commit | 4391e438a4c947f2f4d89ac65c19722a3dd94195 (patch) | |
| tree | e5fa193a5ed2fe73e5d58cc7c7a7700cd39667b9 | |
| parent | f9f1ffc85058c90e1654292038d61f26819009b2 (diff) | |
| download | findutils-4391e438a4c947f2f4d89ac65c19722a3dd94195.tar.gz | |
doc: generate manuals with `makeinfo --no-split`
* doc/Makefile.am (AM_MAKEINFOFLAGS): Add for --no-split option.
(find_mono.html): Remove --no-split from makeinfo invocation.
* NEWS (Documentation Changes): Document the change.
* doc/.gitignore (/find.info-1,/find.info-2): Remove entries.
Suggested by Antonio Diaz Diaz <antonio@gnu.org> in
https://lists.gnu.org/r/bug-findutils/2022-11/msg00001.html
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | doc/.gitignore | 2 | ||||
| -rw-r--r-- | doc/Makefile.am | 6 |
3 files changed, 10 insertions, 3 deletions
@@ -13,6 +13,11 @@ GNU findutils NEWS - User visible changes. -*- outline -*- (allout) findutils now builds again on systems with musl-libc. This requires gettext-0.19.8. +** Documentation Changes + + When generating the Texinfo manual, `makeinfo` is invoked with the --no-split + option for all output formats now; this avoids files like find.info-[12]. + * Noteworthy changes in release 4.9.0 (2022-02-22) [stable] diff --git a/doc/.gitignore b/doc/.gitignore index 5894fa1f..a5451b14 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -9,8 +9,6 @@ /find.fns /find.html/ /find.info -/find.info-1 -/find.info-2 /find.ky /find.log /find.pdf diff --git a/doc/Makefile.am b/doc/Makefile.am index d16ebfa4..47c2f2b2 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -26,6 +26,10 @@ CLEANFILES = find.txt find_mono.html findutils.texi_html_node.tar.gz dblocation. find.txt tmp-doc-install find_mono.html.gz MAKEINFOTXT = $(MAKEINFO) --plaintext +# Tell makeinfo to put everything in a single info file: <package>.info. +# Otherwise, it would also generate files with names like <package>.info-[12]. +AM_MAKEINFOFLAGS = --no-split + find.txt: find.texi $(srcdir)/version.texi $(find_TEXINFOS) # find.txt is a file which we need to know how to build @@ -51,7 +55,7 @@ find.txt: find.texi $(srcdir)/version.texi $(find_TEXINFOS) # This rule is derived from the generic .texi.html rule. find_mono.html: find.texi rm -rf $(@:.html=.htp) - if $(MAKEINFOHTML) --no-split $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ + if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $(@:.html=.htp) find.texi; \ then \ rm -rf $@; \ |