From: Alexandre Duret-Lutz Date: Wed, 8 Jun 2005 19:41:26 +0000 (+0000) Subject: * lib/am/texibuild.am (?GENERIC_INFO?%SOURCE_SUFFIX%%DEST_SUFFIX%): X-Git-Tag: Release-1-9b~149 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aac860350a31d3650ad9272b168d70ca6bcf7d9e;p=thirdparty%2Fautomake.git * lib/am/texibuild.am (?GENERIC_INFO?%SOURCE_SUFFIX%%DEST_SUFFIX%): Do not backup any file if makeinfo is not installed. * lib/missing (makeinfo): Do not touch a missing info file. * tests/txinfo30.test: New file. * tests/Makefile.am (TESTS): Add txinfo30.test. Report from Bob Proulx. --- diff --git a/ChangeLog b/ChangeLog index ef828b774..e8b5a120a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2005-06-08 Alexandre Duret-Lutz + * lib/am/texibuild.am (?GENERIC_INFO?%SOURCE_SUFFIX%%DEST_SUFFIX%): + Do not backup any file if makeinfo is not installed. + * lib/missing (makeinfo): Do not touch a missing info file. + * tests/txinfo30.test: New file. + * tests/Makefile.am (TESTS): Add txinfo30.test. + Report from Bob Proulx. + * doc/automake.texi (Extending aclocal): Typo. 2005-05-24 Brian Gough (tiny change) diff --git a/doc/stamp-vti b/doc/stamp-vti index e98ea9084..6ea5b6562 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 14 May 2005 -@set UPDATED-MONTH May 2005 +@set UPDATED 8 June 2005 +@set UPDATED-MONTH June 2005 @set EDITION 1.9a @set VERSION 1.9a diff --git a/doc/version.texi b/doc/version.texi index e98ea9084..6ea5b6562 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 14 May 2005 -@set UPDATED-MONTH May 2005 +@set UPDATED 8 June 2005 +@set UPDATED-MONTH June 2005 @set EDITION 1.9a @set VERSION 1.9a diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am index cd373e72e..b04b18879 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, 2004 Free Software Foundation, Inc. +## 2003, 2004, 2005 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 @@ -37,9 +37,13 @@ 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; else :; fi; \ - done; \ +## If makeinfo is not installed we must not backup the files so +##`missing' can do its job and touch $@ if it exists. + if ($(MAKEINFO) --version >/dev/null 2>&1); then \ + 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; else :; fi; \ + done; \ + else :; fi && \ ?INSRC? cd "$$am__cwd"; \ if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) %MAKEINFOFLAGS% \ ?!INSRC? -o $@ `test -f '%SOURCE_INFO%' || echo '$(srcdir)/'`%SOURCE_INFO%; \ diff --git a/lib/missing b/lib/missing index 4228a2046..894e786e1 100755 --- a/lib/missing +++ b/lib/missing @@ -1,7 +1,7 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-05-14.22 +scriptversion=2005-06-08.21 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. @@ -297,6 +297,9 @@ WARNING: \`$1' is $msg. You should only need it if # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; diff --git a/tests/Makefile.am b/tests/Makefile.am index 227477d7b..452b4f7b0 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -546,6 +546,7 @@ txinfo26.test \ txinfo27.test \ txinfo28.test \ txinfo29.test \ +txinfo30.test \ transform.test \ unused.test \ vars.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index 818f838a7..c4557e677 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -666,6 +666,7 @@ txinfo26.test \ txinfo27.test \ txinfo28.test \ txinfo29.test \ +txinfo30.test \ transform.test \ unused.test \ vars.test \ diff --git a/tests/txinfo30.test b/tests/txinfo30.test new file mode 100755 index 000000000..26f3910c9 --- /dev/null +++ b/tests/txinfo30.test @@ -0,0 +1,63 @@ +#! /bin/sh +# Copyright (C) 2005 Free Software Foundation, Inc. +# +# This file is part of GNU Automake. +# +# GNU Automake is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# GNU Automake is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Automake; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. + +# Make sure `missing texinfo' does not create empty files. +# Report from Bob Proulx. + +. ./defs || exit 1 + +set -e + +echo info_TEXINFOS = bar.texi >Makefile.am +echo grepme >bar.info +$sleep +cat >bar.texi <>configure.in + +cat >makeinfo <<\EOF +#!/bin/sh +# This script +# 1. fails so `missing' can take over +# 2. does not understand `--version' so `missing' thinks `makeinfo' isn't +# installed +exec false +EOF + +chmod +x makeinfo + +PATH=`pwd`:$PATH +export PATH + +$ACLOCAL +$AUTOCONF +$AUTOMAKE --add-missing + +./configure +$MAKE +grep grepme bar.info +test -f bar.info + +# We should not create a missing bar.info. +rm -f bar.info +$MAKE && exit 1 +test ! -f bar.info