From adbf3ce6dc4dc58e2f5dff85c17e255d4389ebfa Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sat, 15 May 2004 16:12:07 +0000 Subject: [PATCH] * 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. --- ChangeLog | 6 +++++- doc/Makefile.in | 11 +++-------- doc/stamp-vti | 2 +- doc/version.texi | 2 +- lib/am/texibuild.am | 15 +++++---------- 5 files changed, 15 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index e55b80fdf..785747948 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ 2004-05-15 Alexandre Duret-Lutz + * 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 b6c512125..388d304bd 100644 --- 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 f262f04a2..b887cde7f 100644 --- 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 f262f04a2..b887cde7f 100644 --- 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 cfb3be220..f2c96f1da 100644 --- 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% -- 2.47.2