* Makefile.tpl (stage_last): Define $r and $s before using

$(RECURSE_FLAGS_TO_PASS).
* Makefile.in: Regenerate

diff --git a/ChangeLog b/ChangeLog
index 1da2e0d7a6a4b6b033a6206a6845202ea3eca8d7..474f3d44b6dab1c451fcc2b1fc68c2570522f8c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-05  Andreas Schwab  <schwab@suse.de>
+
+       * Makefile.tpl (stage_last): Define $r and $s before using
+       $(RECURSE_FLAGS_TO_PASS).
+       * Makefile.in: Regenerate
+
 2009-01-21  Jeff Johnston  <jjohnstn@redhat.com>
 
        * COPYING.NEWLIB: Add ARM license.
@@ -43,13 +49,13 @@
 
        2008-12-04  Jack Howarth  <howarth@bromo.med.uc.edu>
 
-        * configure.ac: Add double brackets on darwin[912].
-        * configure: Regenerate.
+       * configure.ac: Add double brackets on darwin[912].
+       * configure: Regenerate.
 
        2008-12-02  Jack Howarth  <howarth@bromo.med.uc.edu>
 
-        * configure.ac: Expand to darwin10 and later.
-        * configure: Regenerate.
+       * configure.ac: Expand to darwin10 and later.
+       * configure: Regenerate.
 
 2008-12-02  Andreas Schwab  <schwab@suse.de>
 

diff --git a/Makefile.in b/Makefile.in
index 2df155e1920e7c26e14675f24c3d302f6e1b80cc..3ca3f26d774816bb7ed02f690f51663fca09e175 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -54861,6 +54861,8 @@ do-distclean: distclean-stage1
 # Provide a GCC build when we're building target libraries.  This does
 # not work as a dependency, just as the minimum necessary to avoid errors.
 stage_last:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble
 
 # Same as unstage, but not phony and defaulting to stage1-start.  We place

diff --git a/Makefile.tpl b/Makefile.tpl
index f654fb3df56bc63049daa414467a1871f8385d5d..acb349ff742f99107c4abeaf0847657616ed4587 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1468,6 +1468,8 @@ do-distclean: distclean-stage1
 # Provide a GCC build when we're building target libraries.  This does
 # not work as a dependency, just as the minimum necessary to avoid errors.
 stage_last:
+       @r=`${PWD_COMMAND}`; export r; \
+       s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
        $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble
 
 # Same as unstage, but not phony and defaulting to stage1-start.  We place