projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3c85027
)
In bindisttest, don't try to configure/install the bindist on Windows
author
Ian Lynagh
<igloo@earth.li>
Thu, 23 Aug 2007 02:18:23 +0000
(
02:18
+0000)
committer
Ian Lynagh
<igloo@earth.li>
Thu, 23 Aug 2007 02:18:23 +0000
(
02:18
+0000)
bindisttest/Makefile
patch
|
blob
|
history
diff --git
a/bindisttest/Makefile
b/bindisttest/Makefile
index
d29c3d8
..
cfcf13b
100644
(file)
--- a/
bindisttest/Makefile
+++ b/
bindisttest/Makefile
@@
-14,9
+14,13
@@
all:
$(RM) -rf installed
$(RM) -rf ghc*
$(RM) HelloWorld HelloWorld.o HelloWorld.hi output
$(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
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
$(INST_DIR)/bin/ghc --make HelloWorld
./HelloWorld > output
$(CONTEXT_DIFF) output expected_output