diff options
| author | Ian Lynagh <igloo@earth.li> | 2007-08-23 02:18:23 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2007-08-23 02:18:23 +0000 |
| commit | 24ab916256d1edb5e69e651eef0b7c4c2d3e0386 (patch) | |
| tree | 799d4623f685d5ea271fc85bb994868f86f87b3f /bindisttest | |
| parent | 3c850278c2a33b295a58f1cb78fe8a444155539d (diff) | |
| download | haskell-24ab916256d1edb5e69e651eef0b7c4c2d3e0386.tar.gz | |
In bindisttest, don't try to configure/install the bindist on Windows
Diffstat (limited to 'bindisttest')
| -rw-r--r-- | bindisttest/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bindisttest/Makefile b/bindisttest/Makefile index d29c3d8b7a..cfcf13ba0e 100644 --- a/bindisttest/Makefile +++ b/bindisttest/Makefile @@ -14,9 +14,13 @@ all: $(RM) -rf installed $(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) +else cd $(BIN_DIST_NAME) && ./configure --prefix=$(INST_DIR) cd $(BIN_DIST_NAME) && make install +endif $(INST_DIR)/bin/ghc --make HelloWorld ./HelloWorld > output $(CONTEXT_DIFF) output expected_output |