This commit was manufactured by cvs2svn to create tag 'repo-repo-unification-2000-02-06

unification-2000-02-06'.

Sprout from binutils-2_10-branch 2000-04-04 14:32:33 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'binutils-'
Cherrypick from master 2000-02-07 02:22:31 UTC Jason Molenda <jmolenda@apple.com> '2000-02-06  Jason Molenda  (jsm@bugshack.cygnus.com)':
    ChangeLog
    Makefile.in
    config.guess
    config.sub
    config/ChangeLog
    configure
    configure.in
    include/ChangeLog
    include/ansidecl.h
    include/bfdlink.h
    include/coff/ChangeLog
    include/coff/arm.h
    include/coff/internal.h
    include/coff/pe.h
    include/dis-asm.h
    include/elf/ChangeLog
    include/elf/common.h
    include/elf/mips.h
    include/opcode/ChangeLog
    include/opcode/cgen.h
    include/opcode/d30v.h
    include/opcode/i386.h
    include/opcode/mips.h
Cherrypick from cygnus 1999-05-03 07:29:06 UTC Richard Henderson <rth@redhat.com> '19990502 sourceware import':
    include/coff/sh.h
    include/elf/sh.h
    include/hp-symtab.h
    include/libiberty.h
    include/obstack.h
    include/remote-sim.h
    include/splay-tree.h
    include/symcat.h
    include/wait.h
    ltconfig
    ltmain.sh
Delete:
    config/mh-i370pic
    config/mt-i370pic
    config/mt-wince
    include/bin-bugs.h
    include/coff/mipspe.h
    include/elf/avr.h
    include/elf/i370.h
    include/hashtab.h
    include/opcode/i370.h
    include/partition.h

1 files changed, 2 insertions, 2 deletions

diff --git a/configure b/configure
index c5f029134..499925a48 100755
--- a/configure
+++ b/configure
@@ -587,12 +587,12 @@ esac
 # the gcc version number changes.
 if [ "${with_gcc_version_trigger+set}" = set ]; then
     gcc_version_trigger="$with_gcc_version_trigger"
-    gcc_version=`grep version_string ${with_gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
+    gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${with_gcc_version_trigger}`
 else
     # If gcc's sources are available, define the trigger file.
     if [ -f ${topsrcdir}/gcc/version.c ] ; then
 	gcc_version_trigger=${topsrcdir}/gcc/version.c
-	gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
+	gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${gcc_version_trigger}`
 	case "$arguments" in
 	  *--with-gcc-version-trigger=$gcc_version_trigger* )
 	    ;;