[PATCH] doc: improve install.texi texinfo markup

[Eric Blake]

This partially reverts commit 02fa53b19528cbb849b08b68074dcbc31c5a9715.

* doc/install.texi: Don't force @firstparagraphindent on all
clients; instead, add it only when building INSTALL.  Compress
copyright.
* Makefile.am (INSTALL): Match gnulib's formatting.
Reported by Karl Berry.

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

The autoconf side of things.

 ChangeLog        |    9 +++++++--
 Makefile.am      |    7 +++++--
 doc/install.texi |    5 ++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 80e6e30..4a271f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
 2011-01-04  Eric Blake  <address@hidden>

+       doc: improve install.texi texinfo markup
+       * doc/install.texi: Don't force @firstparagraphindent on all
+       clients; instead, add it only when building INSTALL.  Compress
+       copyright.
+       * Makefile.am (INSTALL): Match gnulib's formatting.
+       Reported by Karl Berry.
+
        maint: update copyright year
        All files changed to add 2011, via 'make update-copyright'.

-2011-01-04  Eric Blake  <address@hidden>
-
        maint: resync upstream files
        * GNUmakefile: Regenerated by 'make fetch'.
        * build-aux/config.guess: Likewise.
diff --git a/Makefile.am b/Makefile.am
index b34d97e..fcd5a16 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,8 +41,11 @@ pkgdata_DATA = $(srcdir)/INSTALL

 MAINTAINERCLEANFILES = $(srcdir)/INSTALL
 $(srcdir)/INSTALL: $(top_srcdir)/doc/install.texi
-       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) --plaintext -o $@ \
-         $(top_srcdir)/doc/install.texi
+       echo @firstparagraphindent insert                       \
+         | cat - $(top_srcdir)/doc/install.texi > tmp.texi
+       $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS)        \
+         --plaintext -o $@ tmp.texi
+       rm -f tmp.texi
 endif


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