doc: improve install.texi texinfo markup

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 <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 80e6e30f1699ca4af88bd44f67b0ac8e3edb3470..4a271f8f832cc0ab6bf2473b5810851f202e51fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
 2011-01-04  Eric Blake  <eblake@redhat.com>
 
+       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  <eblake@redhat.com>
-
        maint: resync upstream files
        * GNUmakefile: Regenerated by 'make fetch'.
        * build-aux/config.guess: Likewise.

diff --git a/Makefile.am b/Makefile.am
index b34d97ee42f02c29d6eda974f762e9367e61bd00..fcd5a169facf9dace5eaf3cf3d1bab5ba8183aeb 100644 (file)
--- 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 a220458cc648e52ea3b137447951f4dd142022e9..c43298b01c906a86028ea055596cb9d4332d412d 100644 (file)
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -2,12 +2,11 @@
 @c the INSTALL file.
 
 @ifclear autoconf
-@firstparagraphindent 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