X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fcabal-flags.mk;h=52624a291c9c4ca32e536a00c82407bbfc4dbc99;hb=845995719b97d8b94e943ad38eeb77ad8d404223;hp=ad01deb6671a4303f2642e64554e1c906f7464e7;hpb=3b3fee836284d09422562e1df88febcfb3200eb9;p=ghc-hetmet.git

diff --git a/mk/cabal-flags.mk b/mk/cabal-flags.mk
index ad01deb..52624a2 100644
--- a/mk/cabal-flags.mk
+++ b/mk/cabal-flags.mk
@@ -35,6 +35,9 @@ endif
 COMMON_CONFIGURE_FLAGS += $(FLAGGED_CONFIGURE_ARGS) \
                           --configure-option=--with-cc=$(CC)
 
+COMMON_CONFIGURE_FLAGS += $(shell [ -e $(HSC2HS_INPLACE) ] && \
+                                  echo --with-hsc2hs=$(HSC2HS_INPLACE) )
+
 ifeq "$(Windows)" "YES"
 NONEXISTENT=c:/NONEXISTENT
 else
@@ -44,7 +47,7 @@ endif
 # We put non-existant paths in when configuring things that we plan to
 # install, as we require that builds don't depend on these paths when
 # making bindists.
-INSTALL_CONFIGURE_FLAGS = \
+INSTALL_DIRS_CONFIGURE_FLAGS = \
     --prefix=$(NONEXISTENT) \
     --bindir=$(NONEXISTENT) \
     --libdir=$(NONEXISTENT) \
@@ -52,18 +55,19 @@ INSTALL_CONFIGURE_FLAGS = \
     --datadir=$(NONEXISTENT) \
     --docdir=$(NONEXISTENT) \
     --haddockdir=$(NONEXISTENT) \
-    --htmldir=$(NONEXISTENT) \
+    --htmldir=$(NONEXISTENT)
+
+INPLACE_DIRS_CONFIGURE_FLAGS = \
+    --prefix=`$(TOP)/utils/pwd/pwd forwardslash`/install-inplace
+
+USE_STAGE1_CONFIGURE_FLAGS = \
     --with-compiler=$(FPTOOLS_TOP_ABS)/compiler/stage1/ghc-inplace \
-    --with-hc-pkg=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg-inplace \
-    --with-hsc2hs=$(HSC2HS_INPLACE) \
-    $(COMMON_CONFIGURE_FLAGS)
+    --with-hc-pkg=$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg-inplace
 
-INPLACE_CONFIGURE_FLAGS = \
-    --prefix=`$(TOP)/utils/pwd/pwd forwardslash`/install-inplace \
+USE_BOOT_CONFIGURE_FLAGS = \
     --with-compiler=$(GHC) \
     --with-hc-pkg=$(GHC_PKG) \
-	--package-db $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf \
-    $(COMMON_CONFIGURE_FLAGS)
+	--package-db $(FPTOOLS_TOP_ABS)/libraries/bootstrapping.conf
 
 # XXX
 #    --bindir='$$prefix/bin' \