* Makefile.in: Remove extra tabs that confuse some versions

	of "make".  Use the newly built gdb to test with by default,
	rather than the first one in the tester's search path.

2 files changed, 35 insertions, 31 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ac3eb76..acaf6d5 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jul 24 09:55:51 1994  Fred Fish  (fnf@cygnus.com)
+
+	* Makefile.in:  Remove extra tabs that confuse some versions
+	of "make".  Use the newly built gdb to test with by default,
+	rather than the first one in the tester's search path.
+
 Sat Jul 23 15:05:47 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
 	* gdb.base/whatis.exp (v_signed_short_array): Fix a typo.
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index 82f7db0..7b95d29 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -1,21 +1,21 @@
 # Makefile for regression testing the GNU debugger.
-#   Copyright (C) 1992, 93, 1994 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
 
-#This file is part of GDB.
+# This file is part of GDB.
 
-#GDB is free software; you can redistribute it and/or modify
-#it under the terms of the GNU General Public License as published by
-#the Free Software Foundation; either version 2, or (at your option)
-#any later version.
+# GDB is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
 
-#GDB is distributed in the hope that it will be useful,
-#but WITHOUT ANY WARRANTY; without even the implied warranty of
-#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#GNU General Public License for more details.
+# GDB is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-#You should have received a copy of the GNU General Public License
-#along with GNU CC; see the file COPYING.  If not, write to
-#the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# You should have received a copy of the GNU General Public License
+# along with this program; see the file COPYING.  If not, write to
+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
 srcdir = .
 prefix = /usr/local
@@ -60,19 +60,21 @@ CXXFLAGS = -g -O
 
 LINK=		ln -s
 SUBDIRS=
-RUNTEST = runtest
-RUNTESTFLAGS = 
 
 EXPECT = `if [ -f $${rootme}/../../expect/expect ] ; then \
           echo $${rootme}/../../expect/expect ; \
           else echo expect ; fi`
 
-RUNTEST_FOR_TARGET = ` \
-  if [ -f $${rootme}/../../dejagnu/site.exp ] ; then \
-    echo $${rootme}/../../dejagnu/runtest ; \
+RUNTEST = $(RUNTEST_FOR_TARGET)
+
+RUNTESTFLAGS =
+
+RUNTEST_FOR_TARGET = `\
+  if [ -f $${srcdir}/../../dejagnu/runtest ]; then \
+    echo $${srcdir}/../../dejagnu/runtest; \
   else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(RUNTEST); \
+    if [ "$(host_canonical)" = "$(target_canonical)" ]; then \
+      echo runtest; \
     else \
       t='$(program_transform_name)'; echo runtest | sed -e '' $$t; \
     fi; \
@@ -137,6 +139,7 @@ GDBFLAGS = -nx
 
 # The use of $$(x_FOR_TARGET) reduces the command line length by not
 # duplicating the lengthy definition.
+
 TARGET_FLAGS_TO_PASS = \
         "prefix=$(prefix)" \
         "exec_prefix=$(exec_prefix)" \
@@ -184,18 +187,9 @@ site.exp: ./config.status Makefile
 	@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
-	@echo "set host_vendor ${host_vendor}" >> ./tmp0
-	@echo "set target_os ${target_os}" >> ./tmp0
-	@echo "set target_alias ${target_alias}" >> ./tmp0
-	@echo "set target_cpu ${target_cpu}" >> ./tmp0
-	@echo "set target_vendor ${target_vendor}" >> ./tmp0
 	@echo "set host_triplet ${host_canonical}" >> ./tmp0
 	@echo "set target_triplet ${target_canonical}" >> ./tmp0
 	@echo "set srcdir ${srcdir}" >> ./tmp0
-		@echo "set objdir `pwd`" >> ./tmp0
 	@echo "set tool gdb" >> ./tmp0
 	@echo "## All variables above are generated by configure. Do Not Edit ##" >> ./tmp0
 		@cat ./tmp0 > site.exp
@@ -204,7 +198,9 @@ site.exp: ./config.status Makefile
 	-@rm -f ./tmp?
 
 installcheck:
+
 check: site.exp all just-check
+
 just-check:
 	rootme=`pwd`; export rootme; \
 	srcdir=${srcdir} ; export srcdir ; \
@@ -212,7 +208,7 @@ just-check:
 	if [ -f $${rootme}/../../expect/expect ] ; then  \
 	  TCL_LIBRARY=$${srcdir}/../../tcl/library ; \
 	  export TCL_LIBRARY ; fi ; \
-	$(RUNTEST_FOR_TARGET) $(RUNTESTFLAGS) --tool gdb GDB=$(GDB) --srcdir $(srcdir)
+	$(RUNTEST) $(RUNTESTFLAGS) GDB=$(GDB)
 
 subdir_do: force
 	@for i in $(DODIRS); do \
@@ -256,7 +252,9 @@ distclean realclean: clean
 	for dir in ${SUBDIRS}; \
 	do \
 		echo "$$dir:"; \
-		(cd $$dir; $(MAKE) distclean); \
+		if [ -d $$dir ]; then \
+			(cd $$dir; $(MAKE) distclean); \
+		fi; \
 	done
 
 Makefile : $(srcdir)/Makefile.in $(srcdir)/configure.in $(host_makefile_frag) $(target_makefile_frag)