diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2007-04-12 13:10:12 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2007-04-12 13:10:12 +0000 |
| commit | fbef88c431d601ef82f045a2ea70d18ea4e0e9b8 (patch) | |
| tree | 1d9d517068cb057e538b6b5f54aa8ee36bdc5f59 /Makefile | |
| parent | 456e4282221478b4c9a13ec4746092f4dd54058f (diff) | |
| download | haskell-fbef88c431d601ef82f045a2ea70d18ea4e0e9b8.tar.gz | |
MERGE: fixes to prep-bin-dist-mingw, and add separate rule to tar the bindist
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -367,10 +367,11 @@ endif # Jiggle the files around to make a valid Windows distribution if necessary ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -binary-dist:: - cd $(BIN_DIST_TMPDIR) && ../distrib/prep-bin-dist-mingw +binary-dist :: fiddle-binary-dist endif +fiddle-binary-dist: + cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) && ../distrib/prep-bin-dist-mingw .PHONY: binary-dist-doc-% BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries @@ -396,7 +397,9 @@ $(BINARY_DIST_LIBRARY_RULES): binary-dist-lib-%: -exec rm {} \; # Tar up the distribution and build a manifest -binary-dist :: +binary-dist :: tar-binary-dist + +tar-binary-dist: ( cd $(BIN_DIST_TOPDIR); tar cf - $(BIN_DIST_NAME) | bzip2 >$(BIN_DIST_TARBALL) ) ( cd $(BIN_DIST_TOPDIR); bunzip2 -c $(BIN_DIST_TARBALL) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >bin-manifest-$(ProjectVersion) ) |