X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=2bee6d672af2570bbd5f78aa2b41142d4fb16ed5;hb=bc554287232d53d7f7dfbcb6de925b57fc877a0c;hp=eaf0e29c0a76e888f11d246c76a5f928fb2903c3;hpb=193f6ef106e2840882151ae9f33a02246e8ea047;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index eaf0e29..2bee6d6 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -913,7 +913,7 @@ install_packages: libffi/package.conf.install rts/package.conf.install
 	    "$(GHC_CABAL_INPLACE)" install \
 		 "$(INSTALLED_GHC_REAL)" \
 		 "$(INSTALLED_GHC_PKG_REAL)" \
-		 "$(STRIP)" \
+		 "$(STRIP_CMD)" \
 		 "$(DESTDIR)$(topdir)" \
 		 $p $(INSTALL_DISTDIR_$p) \
 		 '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \
@@ -992,18 +992,18 @@ unix-binary-dist-prep:
 	"$(RM)" $(RM_OPTS) $(BIN_DIST_PREP_TAR)
 # h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source
 # tree then we want to include the real file, not a symlink to it
-	cd bindistprep && "$(TAR)" hcf - -T ../$(BIN_DIST_LIST) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
+	cd bindistprep && "$(TAR_CMD)" hcf - -T ../$(BIN_DIST_LIST) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
 
 windows-binary-dist-prep:
 	"$(RM)" $(RM_OPTS_REC) bindistprep/
 	$(MAKE) prefix=$(TOP)/$(BIN_DIST_PREP_DIR) install
-	cd bindistprep && "$(TAR)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
+	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
@@ -1107,7 +1107,7 @@ sdist-prep :
 
 .PHONY: sdist
 sdist : sdist-prep
-	"$(TAR)" chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(TOP)/$(SRC_DIST_TARBALL)
+	"$(TAR_CMD)" chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(TOP)/$(SRC_DIST_TARBALL)
 
 sdist-manifest : $(SRC_DIST_TARBALL)
 	tar tjf $(SRC_DIST_TARBALL) | sed "s|^ghc-$(ProjectVersion)/||" | sort >sdist-manifest