From 3a4fee6674b8b7a3ece873a3ac19fa2fea41bf8e Mon Sep 17 00:00:00 2001 From: Andris Pavenis Date: Wed, 4 Oct 2000 20:00:37 +0200 Subject: [PATCH] Makefile.in (bootstrap): avoid recursion if subdir missing * Makefile.in (bootstrap): avoid recursion if subdir missing (cross): ditto (do-proto-toplev): ditto From-SVN: r36713 --- ChangeLog | 6 ++++++ Makefile.in | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b30246bbf1e..ba82e5ad30b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-10-04 Andris Pavenis + + * Makefile.in (bootstrap): avoid recursion if subdir missing + (cross): ditto + (do-proto-toplev): ditto + 2000-09-30 Alexandre Oliva * Makefile.in (DEVO_SUPPORT): Added gettext.m4, libtool.m4, diff --git a/Makefile.in b/Makefile.in index 0836bd5472a..ed03a5d9f9a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1444,7 +1444,7 @@ bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean b s=`cd $(srcdir); pwd`; export s; \ $(SET_LIB_PATH) \ echo "Bootstrapping the compiler"; \ - cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) $@ + cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@ @r=`pwd`; export r; \ s=`cd $(srcdir); pwd`; export s; \ case "$@" in \ @@ -1460,7 +1460,7 @@ bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean b esac; \ $(SET_LIB_PATH) \ echo "$$msg"; \ - cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare + cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare @r=`pwd`; export r; \ s=`cd $(srcdir); pwd` ; export s; \ $(SET_LIB_PATH) \ @@ -1473,7 +1473,7 @@ cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld s=`cd $(srcdir); pwd`; export s; \ $(SET_LIB_PATH) \ echo "Building the C and C++ compiler"; \ - cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++" + cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++" @r=`pwd`; export r; \ s=`cd $(srcdir); pwd` ; export s; \ $(SET_LIB_PATH) \ @@ -1791,7 +1791,7 @@ do-proto-toplev: $(DEVO_SUPPORT) $(SUPPORT_FILES) texinfo/texinfo.tex fi ; \ else ln -s ../$$d proto-toplev/$$d ; fi ; \ done - cd etc ; $(MAKE) info + cd etc && $(MAKE) info $(MAKE) distclean # mkdir proto-toplev/etc