diff options
| author | Simon Marlow <simonmar@microsoft.com> | 2007-11-15 15:53:27 +0000 |
|---|---|---|
| committer | Simon Marlow <simonmar@microsoft.com> | 2007-11-15 15:53:27 +0000 |
| commit | 118231a01f00bbe7726c846a37c1b18badfb8463 (patch) | |
| tree | 680a22da246b1dc5164649b6c20688b96eb6dcca | |
| parent | 91b2014b569ce6b367355040004804a133a45b91 (diff) | |
| download | haskell-118231a01f00bbe7726c846a37c1b18badfb8463.tar.gz | |
on Windows, install to a directory with spaces (test for #1828)
| -rw-r--r-- | bindisttest/Makefile | 13 | ||||
| -rw-r--r-- | mk/config.mk.in | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/bindisttest/Makefile b/bindisttest/Makefile index c26ca79f68..2b56a05f56 100644 --- a/bindisttest/Makefile +++ b/bindisttest/Makefile @@ -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 diff --git a/mk/config.mk.in b/mk/config.mk.in index 32176c18b6..104694e07d 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -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 |