Skip to content

Commit

Permalink
INSTALL: convert to '' quoting, drop blank line at end
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
ebblake committed Jan 23, 2012
1 parent ae930c7 commit ac8beb0
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ac8beb0

Please sign in to comment.