diff --git a/ChangeLog b/ChangeLog
index afe55cf79ae4..baa3f1c31087 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-11  Paolo Bonzini  <bonzini@gnu.org>
+
+	PR ada/22340
+
+	* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Fix pasto.
+	* Makefile.in: Regenerate.
+
 2005-07-07  Mark Mitchell  <mark@codesourcery.com>
 
 	* MAINTAINERS: Remove Dave Brolley as a cpplib maintainer.  Add Dave
diff --git a/Makefile.in b/Makefile.in
index fb204818e91b..01c4d76cd1d4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -529,6 +529,7 @@ BASE_FLAGS_TO_PASS = \
 	"infodir=$(infodir)" \
 	"libdir=$(libdir)" \
 	"libexecdir=$(libexecdir)" \
+	"lispdir=$(lispdir)" \
 	"localstatedir=$(localstatedir)" \
 	"mandir=$(mandir)" \
 	"oldincludedir=$(oldincludedir)" \
@@ -33746,7 +33747,7 @@ objext = .o
 # Flags to pass to stage2 and later makes.
 POSTSTAGE1_FLAGS_TO_PASS = \
 	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
-	STAGE_PREFIX=$$r/stage-gcc/ \
+	STAGE_PREFIX=$$r/prev-gcc/ \
 	CFLAGS="$(BOOT_CFLAGS)" \
 	ADAC="\$$(CC)"
 
diff --git a/Makefile.tpl b/Makefile.tpl
index 73d0dcc0489e..2a8b2ef5973d 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1319,7 +1319,7 @@ objext = .o
 # Flags to pass to stage2 and later makes.
 POSTSTAGE1_FLAGS_TO_PASS = \
 	CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
-	STAGE_PREFIX=$$r/stage[+prev+]-gcc/ \
+	STAGE_PREFIX=$$r/prev-gcc/ \
 	CFLAGS="$(BOOT_CFLAGS)" \
 	ADAC="\$$(CC)"