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

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

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

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 = {

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
 

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