aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorBen Elliston <bje@au.ibm.com>2005-06-29 20:30:00 +0000
committerBen Elliston <bje@au.ibm.com>2005-06-29 20:30:00 +0000
commitc329887411085ea0d667a86d12e27723a24a77c4 (patch)
tree93912c2815efc95c26cff409ac58bed6c215a064 /gas
parent89b85085048728f2d92b63fd85ed9f4564b04fba (diff)
downloadfsf-binutils-gdb-c329887411085ea0d667a86d12e27723a24a77c4.zip
fsf-binutils-gdb-c329887411085ea0d667a86d12e27723a24a77c4.tar.gz
fsf-binutils-gdb-c329887411085ea0d667a86d12e27723a24a77c4.tar.bz2
* Makefile.am (EXPECT): Set to expect.
(RUNTEST): Likewise, set to runtest. * Makefile.in: Regenerate.
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/Makefile.am9
-rw-r--r--gas/Makefile.in10
3 files changed, 10 insertions, 15 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index f234a75..10ceaf3 100644
--- 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 50166a8..19a9865 100644
--- 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 d96861e..8bdc353 100644
--- 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.