on Windows, install to a directory with spaces (test for #1828)

[ghc-hetmet.git] / bindisttest / Makefile

diff --git a/bindisttest/Makefile b/bindisttest/Makefile
index cfcf13b..2b56a05 100644 (file)
--- 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