* lib/am/texibuild.am (?!GENERIC_INFO?%DEST_INFO_PREFIX%%DEST_SUFFIX%):

Fold a few lines to reduce the output by 5 lines.
Suggested by Karl Berry.

diff --git a/ChangeLog b/ChangeLog
index e55b80fdf5e147de01efa9c680a2e95c6003a706..78574794800046c22212fb20440085a1d8022dd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
 2004-05-15  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       * lib/am/texibuild.am (?!GENERIC_INFO?%DEST_INFO_PREFIX%%DEST_SUFFIX%):
+       Fold a few lines to reduce the output by 5 lines.
+       Suggested by Karl Berry.
+
        * automake.in (parse_arguments, MAIN): Give more precise
-       diagnostics when not input file is found.
+       diagnostics when no input file is found.
        * tests/output5.test: Adjust.
        Suggested by Jens Petersen.
 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index b6c512125ef208aa3a79ccf969419b29ad028698..388d304bd1cea77421e5faa62bbc799f0de09bf8 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -178,15 +178,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 .texi.info:
-       restore=: && \
-       backupdir="$(am__leading_dot)am$$$$" && \
+       restore=: && backupdir="$(am__leading_dot)am$$$$" && \
        am__cwd=`pwd` && cd $(srcdir) && \
        rm -rf $$backupdir && mkdir $$backupdir && \
        for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
-         if test -f $$f; then \
-           mv $$f $$backupdir; \
-           restore=mv; \
-         fi; \
+         if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
        done; \
        cd "$$am__cwd"; \
        if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
@@ -199,8 +195,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
          cd $(srcdir) && \
          $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
        fi; \
-       rm -rf $$backupdir; \
-       exit $$rc
+       rm -rf $$backupdir; exit $$rc
 
 .texi.dvi:
        TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \

diff --git a/doc/stamp-vti b/doc/stamp-vti
index f262f04a299fe7d6bbc58debcfd45a598dd01957..b887cde7f4c9e561831b18ff96933fe5261bdcb8 100644 (file)
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 13 May 2004
+@set UPDATED 15 May 2004
 @set UPDATED-MONTH May 2004
 @set EDITION 1.8a
 @set VERSION 1.8a

diff --git a/doc/version.texi b/doc/version.texi
index f262f04a299fe7d6bbc58debcfd45a598dd01957..b887cde7f4c9e561831b18ff96933fe5261bdcb8 100644 (file)
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 13 May 2004
+@set UPDATED 15 May 2004
 @set UPDATED-MONTH May 2004
 @set EDITION 1.8a
 @set VERSION 1.8a

diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index cfb3be22069f499019c131bc64822da6d460da4d..f2c96f1dae910144038d0821d6ebe94999c526b3 100644 (file)
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -1,6 +1,6 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-## Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+##   2003, 2004  Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -34,15 +34,11 @@
 ##    to fail, the info files are not removed.  (They are needed by the
 ##    developer while he writes documentation.)
 ## *.iNN files are used on DJGPP.  See the comments in install-info-am
-       restore=: && \
-       backupdir="$(am__leading_dot)am$$$$" && \
+       restore=: && backupdir="$(am__leading_dot)am$$$$" && \
 ?INSRC?        am__cwd=`pwd` && cd $(srcdir) && \
        rm -rf $$backupdir && mkdir $$backupdir && \
        for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
-         if test -f $$f; then \
-           mv $$f $$backupdir; \
-           restore=mv; \
-         fi; \
+         if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
        done; \
 ?INSRC?        cd "$$am__cwd"; \
        if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS% \
@@ -58,8 +54,7 @@
 ?INSRC?          cd $(srcdir) && \
          $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
        fi; \
-       rm -rf $$backupdir; \
-       exit $$rc
+       rm -rf $$backupdir; exit $$rc
 
 INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX%