diff --git a/src/Makefile.in b/src/Makefile.in
index 05ad632ea73631e0048677ab292fb511c5353f9d..6091efa251039bee81de1ac24e79d005a9ea9143 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.in,v 1.310 2002/05/04 15:19:33 mast Exp $
+# $Id: Makefile.in,v 1.311 2002/05/13 19:03:07 mast Exp $
 #
 
 # This line is needed on some machines.
@@ -518,7 +518,7 @@ gdb_verify: module_testsuites testsuite master-stamp
 	@echo >>.gdbinit break debug_fatal
 	@if test "$(TESTARGS)" = "" ; then args="-a -v -v" ; else args="$(TESTARGS)" ; fi;  \
 	echo >>.gdbinit run -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS) $(TMP_BINDIR)/test_pike.pike --no-watchdog $$args
-	gdb ./pike
+	gdb $(TMP_BUILDDIR)/pike
 	@rm .gdbinit
 
 # fast test
diff --git a/src/modules/dynamic_module_makefile.in b/src/modules/dynamic_module_makefile.in
index b5cda67ae32d378ed3ae6589784bc4ac52f045f6..ce654cc09bc2d3cc53e459f32435644b7d217f79 100644
--- a/src/modules/dynamic_module_makefile.in
+++ b/src/modules/dynamic_module_makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: dynamic_module_makefile.in,v 1.94 2002/05/04 15:19:34 mast Exp $
+# $Id: dynamic_module_makefile.in,v 1.95 2002/05/13 19:03:07 mast Exp $
 #
 
 
@@ -170,8 +170,8 @@ verbose_verify: module_testsuite  $(MODULE_TESTS)
 
 gdb_verify: module_testsuite
 	@echo >.gdbinit handle SIGUSR1 nostop noprint pass
-	@echo >>.gdbinit run -DNOT_INSTALLED -m ../../lib/master.pike $(PIKEOPTS) $(SRCDIR)/../../../bin/test_pike.pike module_testsuite -v -v -f
-	gdb ../../pike
+	@echo >>.gdbinit run -DNOT_INSTALLED -m $(TMP_BUILDDIR)/master.pike $(PIKEOPTS) $(TMP_BINDIR)/test_pike.pike module_testsuite -v -v -f
+	gdb $(TMP_BUILDDIR)/pike
 	@rm .gdbinit
 
 
diff --git a/src/modules/static_module_makefile.in b/src/modules/static_module_makefile.in
index dce98b8cd52c7a75aaa0e1d79288822c465ccf34..9598111dc266b7e4c0450740498dd968fc345b62 100644
--- a/src/modules/static_module_makefile.in
+++ b/src/modules/static_module_makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: static_module_makefile.in,v 1.85 2002/05/04 15:19:34 mast Exp $
+# $Id: static_module_makefile.in,v 1.86 2002/05/13 19:03:07 mast Exp $
 #
 
 
@@ -178,8 +178,8 @@ verbose_verify: module_testsuite $(MODULE_TESTS)
 
 gdb_verify: module_testsuite
 	@echo >.gdbinit handle SIGUSR1 nostop noprint pass
-	@echo >>.gdbinit run -DNOT_INSTALLED -m ../../lib/master.pike $(PIKEOPTS) $(SRCDIR)/../../../bin/test_pike.pike module_testsuite -v -v -f
-	gdb ../../pike
+	@echo >>.gdbinit run -DNOT_INSTALLED -m $(TMP_BUILDDIR)/master.pike $(PIKEOPTS) $(TMP_BINDIR)/test_pike.pike module_testsuite -v -v -f
+	gdb $(TMP_BUILDDIR)/pike
 	@rm .gdbinit
 
 install: $(MODULE_INSTALL)