X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=bindisttest%2Fghc.mk;h=e051be0ccd303b183b56729f1abf9db62116a3d5;hb=HEAD;hp=0530ae00f1c0c21f63da0992dbc944012c50a550;hpb=71e0c82863b0021955ca76eb5c5b285714f46b73;p=ghc-hetmet.git

diff --git a/bindisttest/ghc.mk b/bindisttest/ghc.mk
index 0530ae0..e051be0 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,11 +30,15 @@ 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"
 	mv bindisttest/a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
 else
-	cd bindisttest/a/b/c/$(BIN_DIST_NAME) && ./configure --prefix=$(TOP)/$(BIN_DIST_INST_DIR)
+	cd bindisttest/a/b/c/$(BIN_DIST_NAME) && ./configure --prefix=$(TOP)/$(BIN_DIST_INST_DIR) --with-gcc="$(WhatGccIsCalled)"
 	cd bindisttest/a/b/c/$(BIN_DIST_NAME) && $(MAKE) install
 endif
 ifeq "$(GhcProfiled)" "NO"