From 51cfd7da2c4839d0c96fdef34eef0ccb1f86c0a3 Mon Sep 17 00:00:00 2001
From: Gary Houston <ghouston@arglist.com>
Date: Sun, 18 Mar 2001 23:17:32 +0000
Subject: [PATCH] 	* check-guile.in: use @srcdir@ instead of
 @test_suite_dir@.  use 	the current directory (build dir) not srcdir
 to find guile 	executable.  otherwise "make check" doesn't work with a
 separate 	build directory.  create the test log in 
 $build_dir/check-guile.log instead of in srcdir/test-suite 	directory. 
 * configure.in: don't define or substitute test_suite_dir.

	* guile-test: use #!/bogus-path/..., not #!/home/dirk/... in the
	first line.
---
 ChangeLog             | 10 ++++++++++
 check-guile.in        | 10 ++++++----
 configure.in          |  4 ----
 test-suite/ChangeLog  |  5 +++++
 test-suite/guile-test |  2 +-
 5 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4e183084c..21239b02e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-18  Gary Houston  <ghouston@arglist.com>
+
+	* check-guile.in: use @srcdir@ instead of @test_suite_dir@.  use
+	the current directory (build dir) not srcdir to find guile
+	executable.  otherwise "make check" doesn't work with a separate
+	build directory.  create the test log in
+	$build_dir/check-guile.log instead of in srcdir/test-suite
+	directory.
+	* configure.in: don't define or substitute test_suite_dir.
+
 2001-03-17  Gary Houston  <ghouston@arglist.com>
 
 	* configure.in: don't append threads.doc to EXTRA_DOT_DOC_FILES,
diff --git a/check-guile.in b/check-guile.in
index 89410eae0..edc808eac 100644
--- a/check-guile.in
+++ b/check-guile.in
@@ -11,15 +11,17 @@
 #
 # Dependencies: dirname sed
 
-TEST_SUITE_DIR=@test_suite_dir@
-parent=`dirname $TEST_SUITE_DIR`
+TEST_SUITE_DIR=@srcdir@/test-suite
+parent=@srcdir@
+build_dir=`pwd`
 
 if [ x"$1" = x-i ] ; then
     guile=$2
     shift
     shift
+    glp=
 else
-    guile=$parent/libguile/guile
+    guile=$build_dir/libguile/guile
     glp=$parent
 fi
 
@@ -38,6 +40,6 @@ else
 fi
 
 cd $TEST_SUITE_DIR
-exec $guile -e main -s guile-test --test-suite $TEST_SUITE_DIR/tests "$@"
+exec $guile -e main -s guile-test --test-suite $TEST_SUITE_DIR/tests --log-file $build_dir/check-guile.log "$@"
 
 # check-guile ends here
diff --git a/configure.in b/configure.in
index 628109d74..7dcd92053 100644
--- a/configure.in
+++ b/configure.in
@@ -534,10 +534,6 @@ AC_SUBST(LIBLOBJS)
 AC_SUBST(EXTRA_DOT_DOC_FILES)
 AC_SUBST(EXTRA_DOT_X_FILES)
 
-# Support for "make check"
-test_suite_dir="`(cd $srcdir ; pwd)`/test-suite"
-AC_SUBST(test_suite_dir)
-
 AC_OUTPUT([Makefile libguile/Makefile libguile/guile-snarf libguile/guile-doc-snarf libguile/guile-func-name-check libguile/guile-snarf.awk libguile/versiondat.h ice-9/Makefile oop/Makefile oop/goops/Makefile qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile guile-config/Makefile doc/Makefile check-guile], [chmod +x libguile/guile-snarf libguile/guile-doc-snarf libguile/guile-func-name-check check-guile])
 
 dnl Local Variables:
diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index f7a6d9076..e1b177b53 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-18  Gary Houston  <ghouston@arglist.com>
+
+	* guile-test: use #!/bogus-path/..., not #!/home/dirk/... in the
+	first line.
+	
 2001-03-12  Dirk Herrmann  <D.Herrmann@tu-bs.de>
 
 	* tests/syntax.test:  Added a test for let* bindings and
diff --git a/test-suite/guile-test b/test-suite/guile-test
index e234322d4..be51fdb60 100755
--- a/test-suite/guile-test
+++ b/test-suite/guile-test
@@ -1,4 +1,4 @@
-#!/home/dirk/bin/guile \
+#!/bogus-path/guile \
 -e main -s
 !#