* Makefile.in (subdirs): Eliminate for loop.

This commit is contained in:
Christopher Faylor 2000-06-18 01:49:23 +00:00
parent 20c7469060
commit a50bf2842f
3 changed files with 25 additions and 12 deletions

View File

@ -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> Sat Jun 17 18:27:59 2000 Christopher Faylor <cgf@cygnus.com>
* Makefile.in (subdirs): Previous change did not fix problem in * Makefile.in (subdirs): Previous change did not fix problem in

View File

@ -218,17 +218,18 @@ install: all $(install_dlls_host)
done done
@$(MAKE) subdirs DO=$@ $(FLAGS_TO_PASS) @$(MAKE) subdirs DO=$@ $(FLAGS_TO_PASS)
subdirs: force subdirs: $(SUBDIRS)
@for i in should-never-exist $(SUBDIRS); do \ @true
if [ -d ./$$i ] ; then \
echo "Making $(DO) in $${i}..." ; \ . $(SUBDIRS): force
@if [ -d ./$@ ]; then \
echo "Making $(DO) in $@..." ; \
if (rootme=`pwd`/ ; export rootme ; \ if (rootme=`pwd`/ ; export rootme ; \
rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \ rootsrc=`cd $(srcdir); pwd`/ ; export rootsrc ; \
cd ./$$i; \ cd ./$@;
$(MAKE) $(FLAGS_TO_PASS) $(DO)) ; then true ; \ $(MAKE) $(FLAGS_TO_PASS) $(DO)) ; then true ; \
else exit 1 ; fi ; \ else exit 1 ; fi ; \
else true ; fi ; \ else true ; fi ; \
done
force: force:

View File

@ -1717,6 +1717,13 @@ if test -n "$configdirs"; then
fi fi
if test -n "$configdirs"; then
dosubdirs=dosubdirs
else
dosubdirs=
fi
MKINSTALLDIRS=$ac_aux_dir/mkinstalldirs 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" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./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 $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 test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 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_vendor@%$target_vendor%g
s%@target_os@%$target_os%g s%@target_os@%$target_os%g
s%@subdirs@%$subdirs%g s%@subdirs@%$subdirs%g
s%@dosubdirs@%$dosubdirs%g
s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
s%@CRT_ID@%$CRT_ID%g s%@CRT_ID@%$CRT_ID%g
s%@RUNTIME@%$RUNTIME%g s%@RUNTIME@%$RUNTIME%g