diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index 385ccadfbd..c401753cb2 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -73,12 +73,12 @@ CXX = ` \
   fi`
 
 GDB = ` \
-  if [ -f $${rootme}/../gdb ] ; then \
-    echo $${rootme}/../gdb ; \
-  else echo gdb; \
+  if [ -f $${rootme}/../gdb ] ; \
+    then echo $${rootme}|sed -e 's@/[^/]*$$@@'|sed -e 's@$$@/gdb@' ; \
+    else echo gdb; \
   fi`
 
-GDBFLAGS =
+GDBFLAGS = -nx
 
 EXPECT = `if [ -f $${rootme}../../expect/expect ] ; \
 	then echo $${rootme}../../expect/expect ; \
@@ -124,6 +124,7 @@ site.exp: ./config.status Makefile
 	@echo "## these variables are automatically generated by make ##" > ./tmp0
 	@echo "# Do not edit here. If you wish to override these values" >> ./tmp0
 	@echo "# add them to the last section" >> ./tmp0
+	@echo "set GDBFLAGS \"${GDBFLAGS}\"" >> ./tmp0
 	@echo "set host_os ${host_os}" >> ./tmp0
 	@echo "set host_alias ${host_alias}" >> ./tmp0
 	@echo "set host_cpu ${host_cpu}" >> ./tmp0