X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=bindisttest%2FMakefile;h=71cb578ef15e58295750e61223663773298d2125;hb=cbbee4e8727c583daf32d9bf17f00afaa839ef10;hp=e0ec21abe2ddbf2d008b7c3d0882d42d6d0b04e1;hpb=c59c053f0b8613dd128297ee0b6eef31f001c498;p=ghc-hetmet.git

diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index e0ec21a..71cb578 100644
--- a/bindisttest/Makefile
+++ b/bindisttest/Makefile
@@ -21,23 +21,28 @@ include $(TOP)/mk/config.mk
 
 all:
 	$(RM) -rf $(BIN_DIST_INST_SUBDIR)
-	$(RM) -rf ghc*
+	$(RM) -rf a/b/c/*
 	$(RM) HelloWorld HelloWorld.o HelloWorld.hi output
-	# --force-local makes tar not think that c:/foo refers to a remote file
-	$(TAR) --force-local -jxf $(BIN_DIST_TAR_BZ2)
+# 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_TAR_BZ2)
 ifeq "$(Windows)" "YES"
-	mv $(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
+	mv a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
 else
-	cd $(BIN_DIST_NAME) && ./configure --prefix=$(BIN_DIST_INST_DIR)
-	cd $(BIN_DIST_NAME) && make install
+	cd a/b/c/$(BIN_DIST_NAME) && ./configure --prefix=$(BIN_DIST_INST_DIR)
+	cd a/b/c/$(BIN_DIST_NAME) && make install
 endif
+	$(BIN_DIST_INST_DIR)/bin/runghc HelloWorld > output
+	$(CONTEXT_DIFF) output expected_output
 	$(BIN_DIST_INST_DIR)/bin/ghc --make HelloWorld
 	./HelloWorld > output
 	$(CONTEXT_DIFF) output expected_output
+	$(BIN_DIST_INST_DIR)/bin/ghc-pkg check
 
 clean distclean:
 	$(RM) -rf $(BIN_DIST_INST_SUBDIR)
-	$(RM) -rf ghc*
+	$(RM) -rf a/b/c/*
 	$(RM) HelloWorld HelloWorld.o HelloWorld.hi output
 
 # Ignore a load of other standard targets