Commit 118231a0 authored by Simon Marlow's avatar Simon Marlow
Browse files

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

parent 91b2014b
......@@ -8,8 +8,17 @@ default_target: all
TOP=..
include $(TOP)/mk/boilerplate.mk
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)
......@@ -24,7 +33,7 @@ endif
$(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
......
......@@ -512,8 +512,6 @@ BIN_DIST_TOPDIR_ABS=$(FPTOOLS_TOP_ABS)
BIN_DIST_DIR=$(BIN_DIST_TOPDIR_ABS)/$(BIN_DIST_NAME)
BIN_DIST_TARBALL=$(BIN_DIST_TOPDIR_REL)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2
BIN_DIST_INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/installed
# Definition of installation directories, we don't use half of these, but since
# the configure script has them on offer while passing through, we might as well
# set them. Note that we have to be careful, because the GNU coding standards
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment