From: Ian Lynagh Date: Sat, 10 Oct 2009 16:02:46 +0000 (+0000) Subject: Only make the Windows installer if ISCC is set X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=59b5af28d51688dc6afc410383c3f8fb7565196e Only make the Windows installer if ISCC is set Now that we make bindists during validate, we can't assume that ISCC is available. --- diff --git a/ghc.mk b/ghc.mk index 39147bf..1ae3077 100644 --- a/ghc.mk +++ b/ghc.mk @@ -915,7 +915,11 @@ windows-binary-dist-prep: cd bindistprep && "$(TAR)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2) windows-installer: +ifeq "$(ISCC)" "" + @echo No ISCC, so not making installer +else "$(ISCC)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss +endif nTimes = set -e; for i in `seq 1 $(1)`; do echo Try "$$i: $(2)"; if $(2); then break; fi; done