* Makefile.am (EXPECT): Set to expect.

	(RUNTEST): Likewise, set to runtest.
	* Makefile.in: Regenerate.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 4319811d14394a8a7e6de38f7f6ff2023c6e6e05..5083a9c5accd321967c456fd602d6fe27d03d7ad 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-30  Ben Elliston  <bje@gnu.org>
+
+       * Makefile.am (EXPECT): Set to expect.
+       (RUNTEST): Likewise, set to runtest.
+       * Makefile.in: Regenerate.
+
 2005-06-17  Jakub Jelinek  <jakub@redhat.com>
 
        * readelf.c (CHECK_ENTSIZE_VALUES, CHECK_ENTSIZE): Define.

diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index bac398f44a48c58767fbe66466cf71aa9df8453d..d0f87e380dac90f78baac598ae7164cf8b0bac16 100644 (file)
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -119,12 +119,8 @@ po/POTFILES.in: @MAINT@ Makefile
        for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \
          && mv tmp $(srcdir)/po/POTFILES.in
 
-EXPECT = `if [ -f $$r/../expect/expect ] ; then \
-          echo $$r/../expect/expect ; \
-          else echo expect ; fi`
-RUNTEST = `if [ -f ${srcdir}/../dejagnu/runtest ] ; then \
-           echo ${srcdir}/../dejagnu/runtest ; \
-           else echo runtest ;  fi`
+EXPECT = expect
+RUNTEST = runtest
 
 CC_FOR_TARGET = ` \
   if [ -f $$r/../gcc/xgcc ] ; then \

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index cb6b8645476989f6641ac953fbcb280c8245c497..9fa11a92c0f6581f3f51da09ea5701bc4d66f3de 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -436,14 +436,8 @@ BFDLIB = ../bfd/libbfd.la
 OPCODES = ../opcodes/libopcodes.la
 LIBIBERTY = ../libiberty/libiberty.a
 POTFILES = $(CFILES) $(DEBUG_SRCS) $(HFILES)
-EXPECT = `if [ -f $$r/../expect/expect ] ; then \
-          echo $$r/../expect/expect ; \
-          else echo expect ; fi`
-
-RUNTEST = `if [ -f ${srcdir}/../dejagnu/runtest ] ; then \
-           echo ${srcdir}/../dejagnu/runtest ; \
-           else echo runtest ;  fi`
-
+EXPECT = expect
+RUNTEST = runtest
 CC_FOR_TARGET = ` \
   if [ -f $$r/../gcc/xgcc ] ; then \
     if [ -f $$r/../newlib/Makefile ] ; then \

diff --git a/gas/ChangeLog b/gas/ChangeLog
index f234a75da31f8a89dfa06b7884693aec4553bbbc..10ceaf3ba9f5fb7baec8cb23b89f66796bd0fa11 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-30  Ben Elliston  <bje@gnu.org>
+
+       * Makefile.am (EXPECT): Set to expect.
+       (RUNTEST): Likewise, set to runtest.
+       * Makefile.in: Regenerate.
+
 2005-06-23  Ben Elliston  <bje@gnu.org>
 
        * config/m68k-parse.h: Use ISO C90.

diff --git a/gas/Makefile.am b/gas/Makefile.am
index 50166a857348a080f0ac11be67be813784f088d4..19a9865cb1be16d2721880c630cfbe147156e7fe 100644 (file)
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -527,13 +527,8 @@ $(OBJS): $(INCDIR)/bin-bugs.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
        as.h asintl.h bignum.h bit_fix.h config.h emul.h expr.h flonum.h \
        frags.h hash.h listing.h obj.h read.h symbols.h tc.h write.h
 
-EXPECT = `if [ -f $${rootme}/../expect/expect ] ; then \
-          echo $${rootme}/../expect/expect ; \
-          else echo expect ; fi`
-
-RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \
-               echo $${srcdir}/../dejagnu/runtest ; else echo runtest; \
-          fi`
+EXPECT = expect
+RUNTEST = runtest
 RUNTESTFLAGS=
 
 check-DEJAGNU: site.exp

diff --git a/gas/Makefile.in b/gas/Makefile.in
index d96861e6536d426079c0b201f26aa2ee3951b7db..8bdc35397ba506b0d8c4937b3d244bfb074bf6fa 100644 (file)
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -723,14 +723,8 @@ as_new_LDADD = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
 as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
        $(extra_objects) $(GASLIBS) $(INTLDEPS)
 
-EXPECT = `if [ -f $${rootme}/../expect/expect ] ; then \
-          echo $${rootme}/../expect/expect ; \
-          else echo expect ; fi`
-
-RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \
-               echo $${srcdir}/../dejagnu/runtest ; else echo runtest; \
-          fi`
-
+EXPECT = expect
+RUNTEST = runtest
 RUNTESTFLAGS = 
 
 # The m68k operand parser.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 72b69742e2d3014f633c72d00708892228d2792c..c8e9dd3d5436cfbdb0394cc707e103c55846e372 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-30  Ben Elliston  <bje@gnu.org>
+
+       * Makefile.am (EXPECT): Set to expect.
+       (RUNTEST): Likewise, set to runtest.
+       * Makefile.in: Regenerate.
+
 2005-06-16  Alexander Klimov  <alserkli@inbox.ru>
 
        * emultempl/armelf.em: Add quotes to avoid a null test

diff --git a/ld/Makefile.am b/ld/Makefile.am
index b5ee369f14d6d200ff52e7c58aa14055b5a47fdc..c2e0e81414e7147db2c7ff1d0b9969af00d663f2 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -57,14 +57,8 @@ HOSTING_LIBS = @HOSTING_LIBS@
 HOSTING_EMU = -m $(EMUL)
 
 # Setup the testing framework, if you have one
-EXPECT = `if [ -f $$r/../expect/expect ] ; \
-       then echo $$r/../expect/expect ; \
-       else echo expect ; fi`
-
-RUNTEST = `if [ -f $${srcroot}/../dejagnu/runtest ] ; \
-       then echo $${srcroot}/../dejagnu/runtest ; \
-       else echo runtest ; fi`
-
+EXPECT = expect
+RUNTEST = runtest
 RUNTESTFLAGS =
 
 CC_FOR_TARGET = ` \

diff --git a/ld/Makefile.in b/ld/Makefile.in
index babca2621b88c1dcd04df183f09923700b65474d..fccd2e4aa9e05006043fc6594b9fb1e1193a4168 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -286,14 +286,8 @@ POD2MAN = pod2man --center="GNU Development Tools" \
 HOSTING_EMU = -m $(EMUL)
 
 # Setup the testing framework, if you have one
-EXPECT = `if [ -f $$r/../expect/expect ] ; \
-       then echo $$r/../expect/expect ; \
-       else echo expect ; fi`
-
-RUNTEST = `if [ -f $${srcroot}/../dejagnu/runtest ] ; \
-       then echo $${srcroot}/../dejagnu/runtest ; \
-       else echo runtest ; fi`
-
+EXPECT = expect
+RUNTEST = runtest
 RUNTESTFLAGS = 
 CC_FOR_TARGET = ` \
   if [ -f $$r/../gcc/xgcc ] ; then \