[PATCH] doc: regenerate INSTALL

[Eric Blake]

This partially reverts commit 0a29fc2d832c86d69e98b32bbdbc4e746ca2d16c.

* doc/Makefile (INSTALL, INSTALL.ISO, INSTALL.UTF-8): Re-add
@firstparagraphindent support, now that autoconf dropped it.
(INSTALL_PRELUDE): Reinstate old macro.
* doc/install.texi: Resync from autoconf.
* doc/INSTALL: Reflect recent autoconf update.
* doc/INSTALL.ISO: Likewise.
* doc/INSTALL.UTF-8: Likewise.
Reported by Karl Berry.

Signed-off-by: Eric Blake <address@hidden>
---

The gnulib side of things, with most of the generated diffs elided
from this mail.

 ChangeLog         |   12 +++++
 doc/INSTALL       |  125 +++++++++++++++++++++++++++--------------------------
 doc/INSTALL.ISO   |  125 +++++++++++++++++++++++++++--------------------------
 doc/INSTALL.UTF-8 |  125 +++++++++++++++++++++++++++--------------------------
 doc/Makefile      |   16 ++++++-
 doc/install.texi  |    5 +-
 6 files changed, 216 insertions(+), 192 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6a6198b..ea1d249 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-04  Eric Blake  <address@hidden>
+
+       doc: regenerate INSTALL
+       * doc/Makefile (INSTALL, INSTALL.ISO, INSTALL.UTF-8): Re-add
+       @firstparagraphindent support, now that autoconf dropped it.
+       (INSTALL_PRELUDE): Reinstate old macro.
+       * doc/install.texi: Resync from autoconf.
+       * doc/INSTALL: Reflect recent autoconf update.
+       * doc/INSTALL.ISO: Likewise.
+       * doc/INSTALL.UTF-8: Likewise.
+       Reported by Karl Berry.
+
 2011-01-04  Bruce Korb  <address@hidden>

        git-version-gen: avoid a sub-shell
diff --git a/doc/INSTALL b/doc/INSTALL
index 7761bcc..95dac44 100644
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -1,25 +1,25 @@
 Installation Instructions
 *************************

-   Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.

    Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
 notice and this notice are preserved.  This file is offered as-is,
 without warranty of any kind.

-0.1 Basic Installation
-======================
+Basic Installation
+==================

    Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following more-detailed
-instructions are generic; see the `README' file for instructions
-specific to this package.  Some packages provide this `INSTALL' file but
-do not implement all of the features documented below.  The lack of an
-optional feature in a given package is not necessarily a bug.  More
-recommendations for GNU packages can be found in *note Makefile
-Conventions: (standards)Makefile Conventions.
+configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.

diff --git a/doc/INSTALL.UTF-8 b/doc/INSTALL.UTF-8
index 2f4c76d..fcf2c9b 100644
--- a/doc/INSTALL.UTF-8
+++ b/doc/INSTALL.UTF-8
diff --git a/doc/Makefile b/doc/Makefile
index 9a1ed6b..c40359b 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -28,17 +28,27 @@ html: $(doc).html
 dvi: $(doc).dvi
 pdf: $(doc).pdf

+INSTALL_PRELUDE = echo '@firstparagraphindent insert'
+
 # INSTALL file with old ASCII quotation marks (looks ugly on modern machines).
 INSTALL: install.texi
-       $(MAKEINFO) --plaintext --no-validate $< > $@
+       $(INSTALL_PRELUDE) | cat - $< > tmp.texi
+       $(MAKEINFO) --plaintext --no-validate tmp.texi > $@
+       rm -f tmp.texi

 # INSTALL file with ISO 646 or ISO 8859 quotation marks.
 INSTALL.ISO: install.texi
-       $(MAKEINFO) --plaintext --no-validate $< | sed -e 
"s/\`\([^']*\)'/'\1'/g" > $@
+       $(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
-       $(MAKEINFO) --plaintext --no-validate $< | sed -e 
"s/\`\([^']*\)'/‘\1’/g" > $@
+       $(INSTALL_PRELUDE) | cat - $< > tmpu.texi
+       $(MAKEINFO) --plaintext --no-validate tmpu.texi \
+         | sed -e "s/\`\([^']*\)'/‘\1’/g" > $@
+       rm -f tmpu.texi

 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)

diff --git a/doc/install.texi b/doc/install.texi
index a220458..c43298b 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -2,12 +2,11 @@
 @c the INSTALL file.

 @ifclear autoconf
address@hidden insert

 @unnumbered Installation Instructions

-Copyright @copyright{} 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004,
-2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+Copyright @copyright{} 1994-1996, 1999-2002, 2004-2011 Free Software
+Foundation, Inc.

 Copying and distribution of this file, with or without modification, are
 permitted in any medium without royalty provided the copyright notice
-- 
1.7.3.4