X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=1153121495cb40ca384da216895fa908f4fe6dd9;hb=12ec40c5c2b51e826477c557922297f105a41fdb;hp=661305e219a61fbc3403959f1ad6a457fe10ac4f;hpb=0481fe092fd9e274096fff1fd9885fd68805202a;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 661305e..1153121 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -327,6 +327,7 @@ $(eval $(call addPackage,process))
 $(eval $(call addPackage,random))
 $(eval $(call addPackage,extensible-exceptions))
 $(eval $(call addPackage,haskell98))
+$(eval $(call addPackage,haskell2010))
 $(eval $(call addPackage,hpc))
 $(eval $(call addPackage,pretty))
 $(eval $(call addPackage,template-haskell))
@@ -1000,10 +1001,10 @@ windows-binary-dist-prep:
 	cd bindistprep && "$(TAR_CMD)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
 
 windows-installer:
-ifeq "$(ISCC)" ""
-	@echo No ISCC, so not making installer
+ifeq "$(ISCC_CMD)" ""
+	@echo No ISCC_CMD, so not making installer
 else
-	"$(ISCC)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss
+	"$(ISCC_CMD)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss
 endif
 
 # tryTimes tries to run its third argument multiple times, until it