From 24ab916256d1edb5e69e651eef0b7c4c2d3e0386 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 23 Aug 2007 02:18:23 +0000 Subject: In bindisttest, don't try to configure/install the bindist on Windows --- bindisttest/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1