aboutsummaryrefslogtreecommitdiff
path: root/ld
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 /ld
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 'ld')
-rw-r--r--ld/ChangeLog6
-rw-r--r--ld/Makefile.am10
-rw-r--r--ld/Makefile.in10
3 files changed, 10 insertions, 16 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 72b6974..c8e9dd3 100644
--- 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 b5ee369..c2e0e81 100644
--- 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 babca26..fccd2e4 100644
--- 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 \