more fixups to make a stage 3 build do the right thing with the ghc package

[ghc-hetmet.git] / compiler / package.conf.in

diff --git a/compiler/package.conf.in b/compiler/package.conf.in
index 383ed85..58ce197 100644 (file)
--- a/compiler/package.conf.in
+++ b/compiler/package.conf.in
@@ -263,30 +263,30 @@ exposed-modules:
 #ifdef INSTALLING
 import-dirs:   PKG_LIBDIR"/hslibs-imports/ghc"
 #else
-import-dirs:   FPTOOLS_TOP_ABS"/compiler/stage2/utils",
-              FPTOOLS_TOP_ABS"/compiler/stage2/basicTypes",
-              FPTOOLS_TOP_ABS"/compiler/stage2/types",
-              FPTOOLS_TOP_ABS"/compiler/stage2/hsSyn",
-              FPTOOLS_TOP_ABS"/compiler/stage2/prelude",
-              FPTOOLS_TOP_ABS"/compiler/stage2/rename",
-              FPTOOLS_TOP_ABS"/compiler/stage2/typecheck",
-              FPTOOLS_TOP_ABS"/compiler/stage2/deSugar",
-              FPTOOLS_TOP_ABS"/compiler/stage2/ghci",
-              FPTOOLS_TOP_ABS"/compiler/stage2/coreSyn",
-              FPTOOLS_TOP_ABS"/compiler/stage2/specialise",
-              FPTOOLS_TOP_ABS"/compiler/stage2/simplCore",
-              FPTOOLS_TOP_ABS"/compiler/stage2/stranal",
-              FPTOOLS_TOP_ABS"/compiler/stage2/stgSyn",
-              FPTOOLS_TOP_ABS"/compiler/stage2/simplStg",
-              FPTOOLS_TOP_ABS"/compiler/stage2/codeGen",
-              FPTOOLS_TOP_ABS"/compiler/stage2/main",
-              FPTOOLS_TOP_ABS"/compiler/stage2/profiling",
-              FPTOOLS_TOP_ABS"/compiler/stage2/parser",
-              FPTOOLS_TOP_ABS"/compiler/stage2/cprAnalysis",
-              FPTOOLS_TOP_ABS"/compiler/stage2/ndpFlatten",
-              FPTOOLS_TOP_ABS"/compiler/stage2/iface",
-              FPTOOLS_TOP_ABS"/compiler/stage2/cmm",
-              FPTOOLS_TOP_ABS"/compiler/stage2/nativeGen"
+import-dirs:   FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/utils",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/basicTypes",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/types",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/hsSyn",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/prelude",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/rename",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/typecheck",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/deSugar",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/ghci",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/coreSyn",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/specialise",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/simplCore",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/stranal",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/stgSyn",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/simplStg",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/codeGen",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/main",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/profiling",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/parser",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/cprAnalysis",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/ndpFlatten",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/iface",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/cmm",
+              FPTOOLS_TOP_ABS"/compiler/stage"STAGE"/nativeGen"
 #endif
 
 #ifdef INSTALLING