X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=utils%2Fghc-pkg%2FMakefile;h=897bd73c1fe3f8442a67867ea695b0a5afd0e61d;hb=0bb84f80166f576290451d7d5ee4d18b54386fb1;hp=f30b08772b8c019c23f9f1d436d0f1dd8ba53da7;hpb=fd790cecd738a110347d2658a209f22690e0105f;p=ghc-hetmet.git

diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile
index f30b087..897bd73 100644
--- a/utils/ghc-pkg/Makefile
+++ b/utils/ghc-pkg/Makefile
@@ -12,6 +12,8 @@ SRC_HC_OPTS += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches
 # This causes libghccompat.a to be used:
 include $(GHC_COMPAT_DIR)/compat.mk
 
+SRC_HC_OPTS += $(PACKAGE_CABAL)
+
 # This is required because libghccompat.a must be built with
 # $(GhcHcOpts) because it is linked to the compiler, and hence
 # we must also build with $(GhcHcOpts) here:
@@ -103,9 +105,12 @@ endif
 ifeq "$(INSTALLING)$(HOSTPLATFORM)" "0i386-unknown-mingw32"
 all :: $(INPLACE_SCRIPT_PROG).bat
 
+# See "MSys Note 3" in compiler/Makefile
 $(INPLACE_SCRIPT_PROG).bat :
-	echo '@call $(subst /,\\,$(FPTOOLS_TOP_ABS)/utils/ghc-pkg/$(HS_PROG)) --global-conf $(PKGCONF) %*' >> $@
+	echo '@call $(subst /,\,$(FPTOOLS_TOP_ABS_PLATFORM)/utils/ghc-pkg/$(HS_PROG)) --global-conf $(PKGCONF) %*' >> $@
 	chmod 755 $@
+
+CLEAN_FILES += $(INPLACE_SCRIPT_PROG).bat
 endif
 
 # ghc-pkg is needed to boot in rts/ and library dirs