Re: [PATCH 2/8] maint: remove empty lines at EOF, but excluding modules/*

[Paul Eggert]

On 01/17/12 10:44, Jim Meyering wrote:
> Exempting three more is no problem.

It's no big deal but I'd rather omit the trailing empty line.  The
"cat INSTALL" argument is not that persuasive, as the sort of person who types
"cat INSTALL" or "more INSTALL" is already used to files that don't end in
empty lines.

How about something like this?  It omits the blank line automatically.

diff --git a/ChangeLog b/ChangeLog
index c3b1c40..d734eb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-17  Paul Eggert  <address@hidden>
+
+       doc: omit trailing empty lines from INSTALL etc.
+       * doc/Makefile (INSTALL): Omit trailing empty lines.
+       (INSTALL.ISO, INSTALL-UTF): Build from INSTALL, so that these also
+       omit trailing empty lines.  This simplifies the build procedure.
+
 2012-01-16  Jim Meyering  <address@hidden>
 
        bootstrap: add a FIXME comment to ensure we eventually remove the hack
diff --git a/doc/Makefile b/doc/Makefile
index 9118e1b..ef7d939 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -37,25 +37,22 @@ pdf: $(doc).pdf
 
 INSTALL_PRELUDE = echo '@firstparagraphindent insert'
 
+OMIT_TRAILING_EMPTY_LINES = /^$$/H; /^$$/d; x; s/\n//p; s/\n*//; x
+
 # INSTALL file with old ASCII quotation marks (looks ugly on modern machines).
 INSTALL: install.texi
        $(INSTALL_PRELUDE) | cat - $< > tmp.texi
-       $(MAKEINFO) --plaintext --no-validate tmp.texi > $@
+       $(MAKEINFO) --plaintext --no-validate tmp.texi \
+         | sed -e '$(OMIT_TRAILING_EMPTY_LINES)' > $@
        rm -f tmp.texi
 
 # INSTALL file with ISO 646 or ISO 8859 quotation marks.
-INSTALL.ISO: install.texi
-       $(INSTALL_PRELUDE) | cat - $< > tmpi.texi
-       $(MAKEINFO) --plaintext --no-validate tmpi.texi \
-         | sed -e "s/\`\([^']*\)'/'\1'/g" > $@
-       rm -f tmpi.texi
+INSTALL.ISO: INSTALL
+       sed -e "s/\`\([^']*\)'/'\1'/g" $< > $@
 
 # INSTALL file wit ISO 10646 (Unicode) quotation marks.
-INSTALL.UTF-8: install.texi
-       $(INSTALL_PRELUDE) | cat - $< > tmpu.texi
-       $(MAKEINFO) --plaintext --no-validate tmpu.texi \
-         | sed -e "s/\`\([^']*\)'/‘\1’/g" > $@
-       rm -f tmpu.texi
+INSTALL.UTF-8: INSTALL
+       sed -e "s/\`\([^']*\)'/‘\1’/g" $< > $@
 
 GNULIB_TEXI_FILES = $(filter-out maintain.texi make-stds.texi 
standards.texi,$(wildcard *.texi)) $(wildcard posix-headers/*.texi) $(wildcard 
posix-functions/*.texi) $(wildcard glibc-headers/*.texi) $(wildcard 
glibc-functions/*.texi)
 
-- 
1.7.6.5