summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2011-04-01 00:26:22 +0100
committerIan Lynagh <igloo@earth.li>2011-04-01 00:26:22 +0100
commitc5f09aed1e7de507007c31da7ab6f5576d9f7b6d (patch)
tree9cb4a48be72d590cc00998ec093c17683b42f718
parent90edc9caf6d29b49a484cb0610476aea49d8bad2 (diff)
downloadhaskell-c5f09aed1e7de507007c31da7ab6f5576d9f7b6d.tar.gz
Fix bindisttest in git
-rw-r--r--bindisttest/ghc.mk5
1 files changed, 4 insertions, 1 deletions
diff --git a/bindisttest/ghc.mk b/bindisttest/ghc.mk
index a3e97b08f1..e051be0ccd 100644
--- a/bindisttest/ghc.mk
+++ b/bindisttest/ghc.mk
@@ -19,7 +19,7 @@ endif
.PHONY: test_bindist
test_bindist:
"$(RM)" $(RM_OPTS_REC) bindisttest/$(BIN_DIST_INST_SUBDIR)
- "$(RM)" $(RM_OPTS_REC) bindisttest/a/b/c/*
+ "$(RM)" $(RM_OPTS_REC) bindisttest/a
"$(RM)" $(RM_OPTS) bindisttest/HelloWorld
"$(RM)" $(RM_OPTS) bindisttest/HelloWorld.o
"$(RM)" $(RM_OPTS) bindisttest/HelloWorld.hi
@@ -30,6 +30,9 @@ test_bindist:
# 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:
+ mkdir bindisttest/a
+ mkdir bindisttest/a/b
+ mkdir bindisttest/a/b/c
cd bindisttest/a/b/c/ && $(BZIP2_CMD) -cd ../../../../$(BIN_DIST_TEST_TAR_BZ2) | $(TAR_CMD) -xf -
$(SHELL) bindisttest/checkBinaries.sh $(ProjectVersion)
ifeq "$(Windows)" "YES"