diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-05-04 10:35:04 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-05-04 10:35:04 +0000 |
| commit | 90631447f6517d757edfeb4a5b4cd7dd6c02ffca (patch) | |
| tree | ffb19ed3d59f19147cd46179a94243f749f2c7b1 /bindisttest | |
| parent | fec28e66439061918ff1411be5b13f565e2e5bbc (diff) | |
| download | haskell-90631447f6517d757edfeb4a5b4cd7dd6c02ffca.tar.gz | |
Test bindists in a deeper subdirectory
configure looks for install-sh in . .. ../.. and we don't want it to
find the build system's install-sh.
Diffstat (limited to 'bindisttest')
| -rw-r--r-- | bindisttest/Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/bindisttest/Makefile b/bindisttest/Makefile index e0ec21abe2..1599b37c31 100644 --- a/bindisttest/Makefile +++ b/bindisttest/Makefile @@ -21,15 +21,17 @@ include $(TOP)/mk/config.mk all: $(RM) -rf $(BIN_DIST_INST_SUBDIR) - $(RM) -rf ghc* + $(RM) -rf a/b/c/* $(RM) HelloWorld HelloWorld.o HelloWorld.hi output - # --force-local makes tar not think that c:/foo refers to a remote file - $(TAR) --force-local -jxf $(BIN_DIST_TAR_BZ2) +# We use the a/b/c subdirectory as configure looks for install-sh in +# . .. ../.. and we don't want it to find the build system's install-sh. +# --force-local makes tar not think that c:/foo refers to a remote file + cd a/b/c/ && $(TAR) --force-local -jxf $(BIN_DIST_TAR_BZ2) ifeq "$(Windows)" "YES" - mv $(BIN_DIST_NAME) $(BIN_DIST_INST_DIR) + mv a/b/c/$(BIN_DIST_NAME) $(BIN_DIST_INST_DIR) else - cd $(BIN_DIST_NAME) && ./configure --prefix=$(BIN_DIST_INST_DIR) - cd $(BIN_DIST_NAME) && make install + cd a/b/c/$(BIN_DIST_NAME) && ./configure --prefix=$(BIN_DIST_INST_DIR) + cd a/b/c/$(BIN_DIST_NAME) && make install endif $(BIN_DIST_INST_DIR)/bin/ghc --make HelloWorld ./HelloWorld > output |