diff options
| author | Eric Blake <eblake@redhat.com> | 2012-01-23 10:48:03 -0700 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2012-01-23 11:30:35 -0700 |
| commit | ac8beb00975688cc049035a6d347734bd6416d8a (patch) | |
| tree | a44798bbca84cce9829d8ab2cee3062630ef433a | |
| parent | ae930c76c77f1ff923ca2c511b101735322bc211 (diff) | |
| download | autoconf-ac8beb00975688cc049035a6d347734bd6416d8a.tar.gz | |
INSTALL: convert to '' quoting, drop blank line at end
This is allowed by recent GNU Coding Standards changes, and
mirrors recent gnulib changes:
https://lists.gnu.org/archive/html/bug-gnulib/2012-01/msg00267.html
https://lists.gnu.org/archive/html/bug-gnulib/2012-01/msg00298.html
I've confirmed that after these changes, the INSTALL generated and
installed by autoconf matches the INSTALL.ISO in gnulib.
* Makefile.am ($(srcdir)/INSTALL): Match gnulib INSTALL.ISO.
Signed-off-by: Eric Blake <eblake@redhat.com>
| -rw-r--r-- | Makefile.am | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 7608874a..a1952419 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,13 +39,20 @@ AM_MAKEINFOFLAGS = --no-headers --no-validate --no-split if MAKE_CASE_SENSITIVE pkgdata_DATA = $(srcdir)/INSTALL - MAINTAINERCLEANFILES = $(srcdir)/INSTALL + +# Don't leave blank line at end of file. +OMIT_TRAILING_EMPTY_LINES = '/^$$/H; /^$$/d; x; s/\n//p; s/\n*//; x' +# Prefer 'plain quotes' over `makeinfo quotes'. +CONVERT_QUOTES = "s/\`\([^']*\)'/'\1'/g" + $(srcdir)/INSTALL: $(top_srcdir)/doc/install.texi - echo @firstparagraphindent insert \ + echo @firstparagraphindent insert \ | cat - $(top_srcdir)/doc/install.texi > tmp.texi - $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ - --plaintext -o $@ tmp.texi + $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ + --plaintext tmp.texi \ + | sed -e $(CONVERT_QUOTES) -e $(OMIT_TRAILING_EMPTY_LINES) \ + > $@-t && mv $@-t $@ rm -f tmp.texi endif |