From: Ian Lynagh <igloo@earth.li>
Date: Sun, 24 Aug 2008 23:38:21 +0000 (+0000)
Subject: Change references to the old BIN_DIST_TARBALL to the new BIN_DIST_TAR_BZ2
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=58a669d486c151eeacc353cad000891a56e8b68f

Change references to the old BIN_DIST_TARBALL to the new BIN_DIST_TAR_BZ2
---

diff --git a/Makefile b/Makefile
index 471ac1a..3bd6b72 100644
--- a/Makefile
+++ b/Makefile
@@ -284,7 +284,7 @@ install-docs ::
 
 binary-dist::
 	-rm -rf $(BIN_DIST_DIR)
-	-$(RM) $(BIN_DIST_TARBALL)
+	-$(RM) $(BIN_DIST_TAR_BZ2)
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
@@ -304,8 +304,8 @@ binary-dist :: tar-binary-dist
 
 .PHONY: tar-binary-dist
 tar-binary-dist:
-	( cd $(BIN_DIST_TOPDIR_ABS); tar cf - $(BIN_DIST_NAME) | bzip2 > $(BIN_DIST_TARBALL) )
-	( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(BIN_DIST_TARBALL) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >$(FPTOOLS_TOP_ABS)/bin-manifest-$(ProjectVersion) )
+	( cd $(BIN_DIST_TOPDIR_ABS); tar cf - $(BIN_DIST_NAME) | bzip2 > $(BIN_DIST_TAR_BZ2) )
+	( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(BIN_DIST_TAR_BZ2) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >$(FPTOOLS_TOP_ABS)/bin-manifest-$(ProjectVersion) )
 
 else
 
@@ -405,7 +405,7 @@ endif
 	tar tf $(BIN_DIST_TAR) | sort > bin-manifest-$(ProjectVersion)
 endif
 
-PUBLISH_FILES = $(BIN_DIST_TARBALL)
+PUBLISH_FILES = $(BIN_DIST_TAR_BZ2)
 
 # Upload the distribution and documentation
 ifneq "$(ISCC)" ""
diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index b2cb231..306d069 100644
--- a/bindisttest/Makefile
+++ b/bindisttest/Makefile
@@ -12,7 +12,7 @@ all:
 	$(RM) -rf $(BIN_DIST_INST_SUBDIR)
 	$(RM) -rf ghc*
 	$(RM) HelloWorld HelloWorld.o HelloWorld.hi output
-	$(TAR) -jxf $(BIN_DIST_TARBALL)
+	$(TAR) -jxf $(BIN_DIST_TAR_BZ2)
 ifeq "$(Windows)" "YES"
 	mv $(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
 else