projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
33642e6
)
Avoid using non-standard GNU tar option --force-local
author
Simon Marlow
<marlowsd@gmail.com>
Mon, 30 Nov 2009 11:26:05 +0000
(11:26 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Mon, 30 Nov 2009 11:26:05 +0000
(11:26 +0000)
bindisttest/Makefile
patch
|
blob
|
history
diff --git
a/bindisttest/Makefile
b/bindisttest/Makefile
index
7332bab
..
2780e5f
100644
(file)
--- 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.
$(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
ifeq "$(Windows)" "YES"
mv a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
else