diff --git a/libio/testsuite/ChangeLog b/libio/testsuite/ChangeLog index bd3f28872051..b9b54ed0bcb6 100644 --- a/libio/testsuite/ChangeLog +++ b/libio/testsuite/ChangeLog @@ -3,6 +3,11 @@ Sat Jun 27 23:59:35 1998 Carlo Wood * lib/libio.exp (test_libio): Reset ld_library_path before appending the same path(s) again. +Tue Jun 9 11:23:42 1998 Gavin Koch + + * Makefile.in (EXPECT) : Look for "expect" in the correct + place. + Sat Sep 6 00:49:31 1997 Brendan Kehoe * lib/libio.exp (test_libio): Lose -L.. before -lio, may as well diff --git a/libio/testsuite/Makefile.in b/libio/testsuite/Makefile.in index 75465243d4ad..6258ce7c40ab 100644 --- a/libio/testsuite/Makefile.in +++ b/libio/testsuite/Makefile.in @@ -23,8 +23,8 @@ CXXFLAGS = -g CC = gcc CXX = gcc -EXPECT = `if [ -f $${rootme}/../../expect/expect ] ; then \ - echo $${rootme}/../../expect/expect ; \ +EXPECT = `if [ -f $${rootme}/../../../expect/expect ] ; then \ + echo $${rootme}/../../../expect/expect ; \ else echo expect ; fi` RUNTEST = $(RUNTEST_FOR_TARGET) @@ -83,7 +83,7 @@ just-check: site.exp rootme=`pwd`; export rootme; \ srcdir=${srcdir} ; export srcdir ; \ EXPECT=${EXPECT} ; export EXPECT ; \ - if [ -f $${rootme}/../../expect/expect ] ; then \ + if [ -f $${rootme}/../../../expect/expect ] ; then \ TCL_LIBRARY=$${srcdir}/../../tcl/library ; \ export TCL_LIBRARY ; fi ; \ $(RUNTEST) $(RUNTESTFLAGS)