2004-06-01 Paolo Bonzini <bonzini@gnu.org>

	* Makefile.tpl: Fix typo.
	* Makefile.in: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index 727123ed97abe0ee1d41ba6ee88203b62b686f5e..e5e21b0d2749ced29e983aaae74988ff8bd5b541 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-01  Paolo Bonzini  <bonzini@gnu.org>
+
+       * Makefile.tpl: Fix typo.
+       * Makefile.in: Regenerate.
+
 2004-06-01  Paolo Bonzini <bonzini@gnu.org>
 
        * configure.in: Remove new- prefix from toplevel

diff --git a/Makefile.def b/Makefile.def
index 22bdec0fd972df918843877b0c0d5f980d2f8a2d..c14e32736007172a284211f08e1d4c155be0345f 100644 (file)
--- a/Makefile.def
+++ b/Makefile.def
@@ -222,7 +222,7 @@ bootstrap_stage = {
        extra_make_flags='CFLAGS="$(STAGE1_CFLAGS)"' ; };
 bootstrap_stage = {
        id=2 ; prev=1 ; next=3 ;
-       bootstrap_target=new-bootstrap2 ;
+       bootstrap_target=bootstrap2 ;
        extra_configure_flags="@stage2_werror_flag@" ;
        extra_make_flags="$(POSTSTAGE1_FLAGS_TO_PASS)" ; };
 bootstrap_stage = {

diff --git a/Makefile.in b/Makefile.in
index efa419cd9aea4ff0cabb675c7c6239f2a19000fd..db429bccac61283ff531252ea3bf5d5ee799d651 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -28280,15 +28280,15 @@ all-stage2-gcc: configure-stage2-gcc
        $(STAGE_HOST_EXPORTS)  \
        cd gcc && \
        $(MAKE) $(GCC_FLAGS_TO_PASS)  \
-               CC="$${CC}" CC_FOR_BUILD="${CC_FOR_BUILD}" \
+               CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
                STAGE_PREFIX=$$r/stage1-gcc/  \
                $(POSTSTAGE1_FLAGS_TO_PASS) && $(STAMP) ../all-stage2-gcc
 
 
 
 
-.PHONY: new-bootstrap2
-new-bootstrap2:
+.PHONY: bootstrap2
+bootstrap2:
        $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) stage2-bubble  \
          stage2-start all stage2-end 
 
@@ -28373,7 +28373,7 @@ all-stage3-gcc: configure-stage3-gcc
        $(STAGE_HOST_EXPORTS)  \
        cd gcc && \
        $(MAKE) $(GCC_FLAGS_TO_PASS)  \
-               CC="$${CC}" CC_FOR_BUILD="${CC_FOR_BUILD}" \
+               CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
                STAGE_PREFIX=$$r/stage2-gcc/  \
                $(POSTSTAGE1_FLAGS_TO_PASS) && $(STAMP) ../all-stage3-gcc
 
@@ -28488,7 +28488,7 @@ all-stage4-gcc: configure-stage4-gcc
        $(STAGE_HOST_EXPORTS)  \
        cd gcc && \
        $(MAKE) $(GCC_FLAGS_TO_PASS)  \
-               CC="$${CC}" CC_FOR_BUILD="${CC_FOR_BUILD}" \
+               CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
                STAGE_PREFIX=$$r/stage3-gcc/  \
                $(POSTSTAGE1_FLAGS_TO_PASS) && $(STAMP) ../all-stage4-gcc
 

diff --git a/Makefile.tpl b/Makefile.tpl
index e81d036139682cc02dba9d2dd382768c0c567d90..6ffecc8222228a6d0c2cd7ea325e473f60c839f8 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1529,7 +1529,7 @@ all-stage[+id+]-gcc: configure-stage[+id+]-gcc
        $(GCC_HOST_EXPORTS) [+ ENDIF prev +] \
        cd gcc && \
        $(MAKE) $(GCC_FLAGS_TO_PASS) [+ IF prev +] \
-               CC="$${CC}" CC_FOR_BUILD="${CC_FOR_BUILD}" \
+               CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
                STAGE_PREFIX=$$r/stage[+prev+]-gcc/ [+ ENDIF prev +] \
                [+extra_make_flags+] && $(STAMP) ../all-stage[+id+]-gcc