From a50bf2842ff907bb7211c6843544f297a9aa7401 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Sun, 18 Jun 2000 01:49:23 +0000
Subject: [PATCH] * Makefile.in (subdirs): Eliminate for loop.

---
 winsup/mingw/ChangeLog   |  4 ++++
 winsup/mingw/Makefile.in | 23 ++++++++++++-----------
 winsup/mingw/configure   | 10 +++++++++-
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 30368c7d9..d75521d0a 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 17 21:48:23 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* Makefile.in (subdirs): Eliminate for loop.
+
 Sat Jun 17 18:27:59 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* Makefile.in (subdirs): Previous change did not fix problem in
diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
index 31c0accc9..2108919e0 100644
--- a/winsup/mingw/Makefile.in
+++ b/winsup/mingw/Makefile.in
@@ -218,17 +218,18 @@ install: all $(install_dlls_host)
 	done
 	@$(MAKE) subdirs DO=$@ $(FLAGS_TO_PASS)
 
-subdirs: force
-	@for i in should-never-exist $(SUBDIRS); do \
-	   if [ -d ./$$i ] ; then \
-	     echo "Making $(DO) in $${i}..." ; \
-	     if (rootme=`pwd`/ ; export rootme ; \
-	       rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \
-	       cd ./$$i; \
-	       $(MAKE) $(FLAGS_TO_PASS) $(DO)) ; then true ; \
-	     else exit 1 ; fi ; \
-	   else true ; fi ; \
-	done
+subdirs: $(SUBDIRS)
+	@true
+
+. $(SUBDIRS): force
+	@if [ -d ./$@ ]; then \
+	  echo "Making $(DO) in $@..." ; \
+	  if (rootme=`pwd`/ ; export rootme ; \
+	    rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \
+	    cd ./$@; 
+	    $(MAKE) $(FLAGS_TO_PASS) $(DO)) ; then true ; \
+	  else exit 1 ; fi ; \
+	else true ; fi ; \
 
 force:
 
diff --git a/winsup/mingw/configure b/winsup/mingw/configure
index d66d84803..247f77b4d 100755
--- a/winsup/mingw/configure
+++ b/winsup/mingw/configure
@@ -1717,6 +1717,13 @@ if test -n "$configdirs"; then
 
 fi
 
+if test -n "$configdirs"; then
+  dosubdirs=dosubdirs
+else
+  dosubdirs=
+fi
+
+
 MKINSTALLDIRS=$ac_aux_dir/mkinstalldirs
 
 
@@ -1740,7 +1747,7 @@ MKINSTALLDIRS=$ac_aux_dir/mkinstalldirs
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1744: checking for a BSD compatible install" >&5
+echo "configure:1751: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1965,6 +1972,7 @@ s%@target_cpu@%$target_cpu%g
 s%@target_vendor@%$target_vendor%g
 s%@target_os@%$target_os%g
 s%@subdirs@%$subdirs%g
+s%@dosubdirs@%$dosubdirs%g
 s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
 s%@CRT_ID@%$CRT_ID%g
 s%@RUNTIME@%$RUNTIME%g