X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=8cc97208aad2f52eebb1cbb54555be1033d9d118;hb=80b1239ee0f6938195d25081601fb2852dcda1e9;hp=4c0386e0dc9a0f0b29af3ddb45ba8d12f27ab673;hpb=64d22486ac2005a74769873da2ff39fc89ebd084;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index 4c0386e..8cc9720 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -192,7 +192,7 @@ else
 GHC_PROG=$(odir)/ghc-$(ProjectVersion)
 endif
 
-ifneq "$(stage)" "2"
+ifeq "$(stage)" "1"
 HS_PROG = $(GHC_PROG)
 endif
 
@@ -822,13 +822,11 @@ coreSyn/CorePrep_HC_OPTS += -auto-all
 #-----------------------------------------------------------------------------
 # Building the GHC package
 
-# The GHC package is made from the stage 2 build.  Fortunately the
-# package build system framework more or less does the right thing for
-# us here.
-
-# 		All this section is stage-2 only!
-ifeq "$(stage)" "2"
+# The GHC package is made from the stage 2 build and later.
+# Fortunately the package build system framework more or less does the
+# right thing for us here.
 
+ifneq "$(findstring $(stage), 2 3)" ""
 PACKAGE = ghc
 HIERARCHICAL_LIB = NO
 VERSION = $(ProjectVersion)