summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2009-11-30 11:26:05 +0000
committerSimon Marlow <marlowsd@gmail.com>2009-11-30 11:26:05 +0000
commit94b1c019c4b397d8aad1e8cad8919a1208cceb0a (patch)
treed63c81727ef51daa4db743377aaa2bff44bd72f9
parent33642e6578d9c5fe83005f75fbbfd713222b8196 (diff)
downloadhaskell-94b1c019c4b397d8aad1e8cad8919a1208cceb0a.tar.gz
Avoid using non-standard GNU tar option --force-local
-rw-r--r--bindisttest/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index 7332bab24a..2780e5fa9b 100644
--- a/bindisttest/Makefile
+++ b/bindisttest/Makefile
@@ -31,8 +31,11 @@ all:
$(RM) HelloWorld HelloWorld.o HelloWorld.hi output
# We use the a/b/c subdirectory as configure looks for install-sh in
# . .. ../.. and we don't want it to find the build system's install-sh.
-# --force-local makes tar not think that c:/foo refers to a remote file
- cd a/b/c/ && $(TAR) --force-local -jxf ../../../$(BIN_DIST_TEST_TAR_BZ2)
+#
+# NB. tar has funny interpretation of filenames sometimes (thinking
+# c:/foo is a remote file), so it's safer to bzip and then pipe into
+# tar rather than using tar -xjf:
+ cd a/b/c/ && bzip2 -cd ../../../$(BIN_DIST_TEST_TAR_BZ2) | $(TAR) -xf -
ifeq "$(Windows)" "YES"
mv a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
else