--- /usr/portage/dev-lang/ghc/ghc-5.04.2.ebuild	2003-03-09 00:51:01.000000000 +0100
+++ /usr/local/portage/dev-lang/ghc/ghc-5.04.2.ebuild	2003-03-12 11:40:52.000000000 +0100
@@ -107,15 +107,15 @@
 	local myconf
 	use opengl && myconf="--enable-hopengl" || myconf="--disable-hopengl"
 
-	if test x$need_stage2 = xyes; then
+	if test x$need_stage1 = xyes; then
 		echo ">>> Bootstrapping intermediate GHC ${PV} using GHC ${BASE_GHC_VERSION}"
 
 		pushd "${STAGE1_B}" || die
 			./configure \
 				-host="${CHOST}" \
-				--prefix="${STAGE2_D}/usr" \
+				--prefix="${STAGE1_D}/usr" \
 				--with-ghc="${GHC}" \
-				--without-happy || die "intermediat stage configure failed"
+				--without-happy || die "intermediate stage configure failed"
 			#parallel make causes trouble
 			make || die "intermediate stage make failed"
 			make install || die
@@ -132,10 +132,12 @@
 }
 
 src_install () {
-	make install \
-	    prefix="${D}/usr" \
-		infodir="${D}/usr/share/info" \
-		mandir="${D}/usr/share/man" || die
+	pushd "${STAGE2_B}" || die
+		make install \
+	    		prefix="${D}/usr" \
+			infodir="${D}/usr/share/info" \
+			mandir="${D}/usr/share/man" || die
+	popd
 
 	#need to remove ${D} from ghcprof script
 	cd ${D}/usr/bin