From: Paul Eggert Date: Tue, 17 Jan 2012 23:48:12 +0000 (-0800) Subject: doc: omit trailing empty lines from INSTALL etc. X-Git-Tag: v0.1~1218 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=d4bb8e53138f9909384115e27f18e9f047bdc9f3;p=gnulib.git doc: omit trailing empty lines from INSTALL etc. * doc/Makefile (INSTALL): Omit trailing empty lines. (INSTALL.ISO, INSTALL.UTF-8): Build from INSTALL, so that these also omit trailing empty lines. This simplifies the build procedure. --- diff --git a/ChangeLog b/ChangeLog index d59de31caf..5eff0181b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-01-23 Paul Eggert + + doc: omit trailing empty lines from INSTALL etc. + * doc/Makefile (INSTALL): Omit trailing empty lines. + (INSTALL.ISO, INSTALL.UTF-8): Build from INSTALL, so that these also + omit trailing empty lines. This simplifies the build procedure. + 2012-01-23 Jim Meyering tests: avoid spurious warnings about gl_sockets_startup diff --git a/doc/Makefile b/doc/Makefile index 9118e1b243..e0dd430978 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 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.ISO: INSTALL + sed -e "s/\`\([^']*\)'/'\1'/g" $< > $@ + +# INSTALL file with ISO 10646 (Unicode) quotation marks. +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)