* Makefile.am (fetch): Fetch install-sh from Autoconf CVS.

* lib/config.sub, lib/install-sh: New upstream versions.

diff --git a/ChangeLog b/ChangeLog
index a702928a138c4085438adf4e288c263ad2123f26..676a02715ef204855ba78768252b5587f5dfd2e7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
+2002-06-27  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * Makefile.am (fetch): Fetch install-sh from Autoconf CVS.
+       * lib/config.sub, lib/install-sh: New upstream versions.
+
 2002-06-26  Paul Eggert  <eggert@twinsun.com>
 
        * Makefile.am (maintainer-check): Don't assume that egrep exists;
        this fixes a portability bug introduced in the 2002-06-08 fix for
        PR automake/317.
-       
+
 2002-06-26  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * automake.in (required_targets): Add ps and ps-am.

diff --git a/Makefile.am b/Makefile.am
index 2237821d1316c06ac93c0652184f43d95c257750..37d61fe5cd955541491398d7d0e952d325d41e44 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -254,7 +254,8 @@ WGET = wget
 
 ## Files that we fetch and which we compare against.
 ## FIXME should be a lot more here
-FETCHFILES = config.guess config.sub texinfo.tex Automake/XFile.pm INSTALL
+FETCHFILES = config.guess config.sub texinfo.tex Automake/XFile.pm INSTALL \
+       install-sh
 
 ## Fetch the latest versions of files we care about.
 fetch:
@@ -266,6 +267,7 @@ fetch:
        $(WGET) ftp://ftp.gnu.org/gnu/config/config.sub; \
        $(WGET) ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex; \
        $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/autoconf/autoconf/lib/Autom4te/XFile.pm?content-type=text/plain -O Automake/XFile.pm; \
+       $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/autoconf/autoconf/config/install-sh?content-type=text/plain -O install-sh; \
        $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/autoconf/autoconf/INSTALL?content-type=text/plain -O INSTALL)
        perl -pi -e 's/Autom4te::/Automake::/g' Fetchdir/Automake/XFile.pm
 ## Don't exit after test because we want to give as many errors as

diff --git a/Makefile.in b/Makefile.in
index 66e31c2a64aae4fb4e95c469af9c101af28314ea..85ee96a4ebf9119dd2fe8725e3a2af2c02d404dd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,7 +104,9 @@ EXTRA_DIST = ChangeLog.1996 ChangeLog.1998 ChangeLog.2000 ChangeLog.2001
 
 WGET = wget
 
-FETCHFILES = config.guess config.sub texinfo.tex Automake/XFile.pm INSTALL
+FETCHFILES = config.guess config.sub texinfo.tex Automake/XFile.pm INSTALL \
+       install-sh
+
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
@@ -652,7 +654,7 @@ maintainer-check: automake aclocal
          echo "Suspicious 'rm' invocation." 1>&2; \
          exit 1;                               \
        else :; fi
-       @if egrep 'for .* in \$$\(' $(srcdir)/lib/am/[a-z]*.am; then \
+       @if grep 'for .* in \$$(' $(srcdir)/lib/am/[a-z]*.am; then \
          echo 'Use "list=$$(mumble); for var in $$$$list".' 1>&2 ; \
          exit 1; \
        else :; fi
@@ -789,6 +791,7 @@ fetch:
        $(WGET) ftp://ftp.gnu.org/gnu/config/config.sub; \
        $(WGET) ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex; \
        $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/autoconf/autoconf/lib/Autom4te/XFile.pm?content-type=text/plain -O Automake/XFile.pm; \
+       $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/autoconf/autoconf/config/install-sh?content-type=text/plain -O install-sh; \
        $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/autoconf/autoconf/INSTALL?content-type=text/plain -O INSTALL)
        perl -pi -e 's/Autom4te::/Automake::/g' Fetchdir/Automake/XFile.pm
        @stat=0; for file in $(FETCHFILES); do \

diff --git a/lib/config.sub b/lib/config.sub
index 7f614e1c434ee22e853ad8c2b56f83b77c474c36..cbb2626eef9533276acec0c6d7883d5c894e7dc6 100644 (file)
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
 
-timestamp='2002-05-28'
+timestamp='2002-06-21'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -231,22 +231,30 @@ case $basic_machine in
        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
        | c4x | clipper \
        | d10v | d30v | dlx | dsp16xx \
-       | fr30 \
+       | fr30 | frv \
        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
        | i370 | i860 | i960 | ia64 \
+       | ip2k \
        | m32r | m68000 | m68k | m88k | mcore \
-       | mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
-       | mips64vr4100 | mips64vr4100el | mips64vr4300 \
-       | mips64vr4300el | mips64vr5000 | mips64vr5000el \
-       | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
-       | mipsisa32 | mipsisa64 \
+       | mips | mipsbe | mipseb | mipsel | mipsle \
+       | mips16 \
+       | mips64 | mips64el \
+       | mips64orion | mips64orionel \
+       | mips64vr4100 | mips64vr4100el \
+       | mips64vr4300 | mips64vr4300el \
+       | mips64vr5000 | mips64vr5000el \
+       | mipsisa32 | mipsisa32el \
+       | mipsisa64 | mipsisa64el \
+       | mipsisa64sb1 | mipsisa64sb1el \
+       | mipstx39 | mipstx39el \
        | mn10200 | mn10300 \
        | ns16k | ns32k \
        | openrisc | or32 \
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
        | pyramid \
-       | sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
+       | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+       | sh64 | sh64le \
        | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
        | strongarm \
        | tahoe | thumb | tic80 | tron \
@@ -288,24 +296,33 @@ case $basic_machine in
        | clipper-* | cydra-* \
        | d10v-* | d30v-* | dlx-* \
        | elxsi-* \
-       | f30[01]-* | f700-* | fr30-* | fx80-* \
+       | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
        | h8300-* | h8500-* \
        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
        | i*86-* | i860-* | i960-* | ia64-* \
+       | ip2k-* \
        | m32r-* \
        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
        | m88110-* | m88k-* | mcore-* \
-       | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
-       | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
-       | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
-       | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+       | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+       | mips16-* \
+       | mips64-* | mips64el-* \
+       | mips64orion-* | mips64orionel-* \
+       | mips64vr4100-* | mips64vr4100el-* \
+       | mips64vr4300-* | mips64vr4300el-* \
+       | mips64vr5000-* | mips64vr5000el-* \
+       | mipsisa32-* | mipsisa32el-* \
+       | mipsisa64-* | mipsisa64el-* \
+       | mipsisa64sb1-* | mipsisa64sb1el-* \
+       | mipstx39 | mipstx39el \
        | none-* | np1-* | ns16k-* | ns32k-* \
        | orion-* \
        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
        | pyramid-* \
        | romp-* | rs6000-* \
-       | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
+       | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
+       | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
        | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
        | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
        | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
@@ -996,7 +1013,7 @@ case $basic_machine in
        we32k)
                basic_machine=we32k-att
                ;;
-       sh3 | sh4 | sh3eb | sh4eb)
+       sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
                basic_machine=sh-unknown
                ;;
        sh64)

diff --git a/lib/install-sh b/lib/install-sh
index 398a88e1421823561abbf2d48ca8f263babc04d9..11870f1b0192aa3f321bc3a82552d27f0aa2352d 100755 (executable)
--- a/lib/install-sh
+++ b/lib/install-sh
@@ -128,7 +128,7 @@ else
 # might cause directories to be created, which would be especially bad 
 # if $src (and thus $dsttmp) contains '*'.
 
-       if [ -f $src -o -d $src ]
+       if [ -f "$src" ] || [ -d "$src" ]
        then
                :
        else

diff --git a/stamp-vti b/stamp-vti
index e62037e3bdd3fce2e515fe518a6e581f9f596e6c..ce656431c2006bddf080cc66c89a853c98933ce2 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 26 June 2002
+@set UPDATED 27 June 2002
 @set UPDATED-MONTH June 2002
 @set EDITION 1.6a
 @set VERSION 1.6a

diff --git a/version.texi b/version.texi
index e62037e3bdd3fce2e515fe518a6e581f9f596e6c..ce656431c2006bddf080cc66c89a853c98933ce2 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 26 June 2002
+@set UPDATED 27 June 2002
 @set UPDATED-MONTH June 2002
 @set EDITION 1.6a
 @set VERSION 1.6a