From 53222cbdf1b9079a8ccf0ad0a1baa43265062dae Mon Sep 17 00:00:00 2001
From: "K. Richard Pixley" <rich@cygnus>
Date: Wed, 10 Mar 1993 00:07:50 +0000
Subject: [PATCH] * Makefile.in (setup-dirs): change invocation of make to
 $(MAKE).

---
 ChangeLog   |  9 +++++++++
 Makefile.in | 23 +++++++----------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ec445e167dc..654fd8780bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Mar  9 16:06:12 1993  K. Richard Pixley  (rich@cygnus.com)
+
+	* Makefile.in (setup-dirs): change invocation of make to $(MAKE).
+
+Mon Mar  8 14:52:11 1993  Ken Raeburn  (raeburn@cambridge)
+
+	* config.guess: Recognize i386-ibm-aix (PS/2).
+	* configure.in: Use config/mh-aix386 file for it.
+
 Mon Mar  8 11:12:43 1993  Ian Lance Taylor  (ian@cygnus.com)
 
 	* Makefile.in (GCC_FOR_TARGET): Eliminated definition; use
diff --git a/Makefile.in b/Makefile.in
index ce118d547c1..62d477c6b6d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -106,17 +106,6 @@ CC_FOR_TARGET = ` \
     fi; \
   fi`
 
-GCC_FOR_TARGET = ` \
-  if [ -f $${rootme}/gcc/Makefile ] ; then \
-    echo $${rootme}/gcc/xgcc -B$${rootme}/gcc/; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(CC); \
-    else \
-      t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
-    fi; \
-  fi`
-
 $(start-sanitize-chill)
 CHILL_FOR_TARGET = ` \
   if [ -f $${rootme}/gcc/Makefile ] ; then \
@@ -220,7 +209,7 @@ $(end-sanitize-chill)\
 	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
 	"CXXFLAGS=$(CXXFLAGS)" \
 	"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
-	"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
+	'GCC_FOR_TARGET=$$(CC_FOR_TARGET)' \
 	"INSTALL=$(INSTALL)" \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
@@ -302,9 +291,9 @@ all:	$(ALL)
 .NOEXPORT:
 
 # Do a target for all the subdirectories.  A ``make do-X'' will do a
-# ``make X'' in all subdirectories (because, in general, X depends on
-# fdo-X, a ``make X'' will also do this, but it may do additional work
-# as well).
+# ``make X'' in all subdirectories (because, in general, there is a
+# dependency (below) of X upon do-X, a ``make X'' will also do this,
+# but it may do additional work as well).
 # This target ensures that $(BASE_FLAGS_TO_PASS) appears only once,
 # because it is so large that it can easily overflow the command line
 # length limit on some systems.
@@ -805,6 +794,8 @@ install-chillrt: force
 	else \
 		true ; \
 	fi
+
+all-gdb: all-chillrt
 ### end-sanitize-chill
 
 ### gprof
@@ -1569,7 +1560,7 @@ GDB_SUPPORT_FILES= $(GDB_SUPPORT_DIRS)
 
 setup-dirs: force
 	./configure sun4
-	make clean
+	$(MAKE) clean
 	./configure -rm sun4
 	chmod og=u `find etc $(DEVO_SUPPORT) $(GDB_SUPPORT_FILES) -print`
 
-- 
2.30.2