X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=bindisttest%2FMakefile;h=2b56a05f56252406bf23c7944dd6d090d1c16a51;hb=118231a01f00bbe7726c846a37c1b18badfb8463;hp=cfcf13ba0e93db91bba517c15d4a785fb755f1c5;hpb=24ab916256d1edb5e69e651eef0b7c4c2d3e0386;p=ghc-hetmet.git

diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index cfcf13b..2b56a05 100644
--- a/bindisttest/Makefile
+++ b/bindisttest/Makefile
@@ -8,25 +8,32 @@ default_target: all
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/installed
+ifeq "$(Windows)" "YES"
+BIN_DIST_INST_SUBDIR = "install dir"
+else
+# I very much doubt that paths with spaces will work on Unix
+BIN_DIST_INST_SUBDIR = installed
+endif
+
+BIN_DIST_INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/$(BIN_DIST_INST_SUBDIR)
 
 all:
-	$(RM) -rf installed
+	$(RM) -rf $(BIN_DIST_INST_SUBDIR)
 	$(RM) -rf ghc*
 	$(RM) HelloWorld HelloWorld.o HelloWorld.hi output
-	$(TAR) -jxf ../$(BIN_DIST_TARBALL)
+	$(TAR) -jxf $(BIN_DIST_TARBALL)
 ifeq "$(Windows)" "YES"
-	mv $(BIN_DIST_NAME) $(INST_DIR)
+	mv $(BIN_DIST_NAME) $(BIN_DIST_INST_DIR)
 else
-	cd $(BIN_DIST_NAME) && ./configure --prefix=$(INST_DIR)
+	cd $(BIN_DIST_NAME) && ./configure --prefix=$(BIN_DIST_INST_DIR)
 	cd $(BIN_DIST_NAME) && make install
 endif
-	$(INST_DIR)/bin/ghc --make HelloWorld
+	$(BIN_DIST_INST_DIR)/bin/ghc --make HelloWorld
 	./HelloWorld > output
 	$(CONTEXT_DIFF) output expected_output
 
 clean distclean:
-	$(RM) -rf installed
+	$(RM) -rf $(BIN_DIST_INST_SUBDIR)
 	$(RM) -rf ghc*
 	$(RM) HelloWorld HelloWorld.o HelloWorld.hi output