diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-02-10 21:52:15 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-02-10 21:52:15 +0000 |
| commit | f75d258c4e74aa91dd5c64e47e9d96889870743a (patch) | |
| tree | a49ecd808e41e84b2bc2dee7c6fa98654379eb9f /Makefile | |
| parent | ef378f7cd93227321ce127f542865f1d799e0ccb (diff) | |
| download | haskell-f75d258c4e74aa91dd5c64e47e9d96889870743a.tar.gz | |
Don't use the absolute path to the bindist tarball
On Windows, we end up doing something like
rsync c:/build/ghc-6.10.1-unknown-mingw32.tar.bz2 haskell.org:dist
and it thinks that it is meant to get the file from the host called "c".
Now we just do
rsync ghc-6.10.1-unknown-mingw32.tar.bz2 haskell.org:dist
so rsync understand what we mean.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -314,8 +314,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_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) ) + ( cd $(BIN_DIST_TOPDIR_ABS); $(TAR) cf - $(BIN_DIST_NAME) | bzip2 > $(FPTOOLS_TOP_ABS)/$(BIN_DIST_TAR_BZ2) ) + ( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(FPTOOLS_TOP_ABS)/$(BIN_DIST_TAR_BZ2) | $(TAR) tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >$(FPTOOLS_TOP_ABS)/bin-manifest-$(ProjectVersion) ) else @@ -412,7 +412,7 @@ endif # 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 $(TAR) hcf $(BIN_DIST_TAR) -T $(BIN_DIST_LIST) - cd $(BIN_DIST_PREP_DIR) && $(TAR) rf $(BIN_DIST_TAR) $(BIN_DIST_NAME) + cd $(BIN_DIST_PREP_DIR) && $(TAR) rf ../$(BIN_DIST_TAR) $(BIN_DIST_NAME) bzip2 < $(BIN_DIST_TAR) > $(BIN_DIST_TAR_BZ2) $(TAR) tf $(BIN_DIST_TAR) | sort > bin-manifest-$(ProjectVersion) endif |