PATCH: update Makefiles for expect, runtest

[Ben Elliston <bje+dated+1120508915 dot 5d02b4 at air dot net dot au>]

This patch (committed) updates the EXPECT and RUNTEST make variables,
as these are no longer in-tree.

Ben


[{gas,ld,binutils}/ChangeLog]

2005-06-30  Ben Elliston  <bje@gnu.org>

	* Makefile.am (EXPECT): Set to expect.
	(RUNTEST): Likewise, set to runtest.
	* Makefile.in: Regenerate.

Index: gas/Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/Makefile.am,v
retrieving revision 1.112
diff -u -p -r1.112 Makefile.am
--- gas/Makefile.am	7 Jun 2005 16:09:35 -0000	1.112
+++ gas/Makefile.am	29 Jun 2005 20:20:06 -0000
@@ -527,13 +527,8 @@ $(OBJS): $(INCDIR)/bin-bugs.h $(INCDIR)/
 	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
Index: ld/Makefile.am
===================================================================
RCS file: /cvs/src/src/ld/Makefile.am,v
retrieving revision 1.182
diff -u -p -r1.182 Makefile.am
--- ld/Makefile.am	7 Jun 2005 23:56:50 -0000	1.182
+++ ld/Makefile.am	29 Jun 2005 20:20:24 -0000
@@ -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 = ` \
Index: binutils/Makefile.am
===================================================================
RCS file: /cvs/src/src/binutils/Makefile.am,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile.am
--- binutils/Makefile.am	7 Jun 2005 21:14:09 -0000	1.59
+++ binutils/Makefile.am	29 Jun 2005 20:20:36 -0000
@@ -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 \

Attachment: pgp00000.pgp
Description: PGP signature