diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-01-16 16:37:49 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-01-16 16:37:49 +0000 |
| commit | 82de8caa4fd1ee1102344c721791a12c98b93e5b (patch) | |
| tree | c84975938e436b26f41121861e05788b4db32230 /testsuite/timeout | |
| parent | a56435dc5ffc0b38d840e3fe309bdfb16fb6b2bb (diff) | |
| download | haskell-82de8caa4fd1ee1102344c721791a12c98b93e5b.tar.gz | |
Also canonicalise the install prefix for the timeout program
Diffstat (limited to 'testsuite/timeout')
| -rw-r--r-- | testsuite/timeout/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/testsuite/timeout/Makefile b/testsuite/timeout/Makefile index 8acc229a4a..bdea066616 100644 --- a/testsuite/timeout/Makefile +++ b/testsuite/timeout/Makefile @@ -12,6 +12,9 @@ include $(TOP)/mk/boilerplate.mk TIMEOUT_PROGRAM = install-inplace/bin/timeout$(exeext) +PREFIX := $(abspath install-inplace) +$(eval $(call canonicalise,PREFIX)) + ifeq "$(filter thr, $(GhcRTSWays))" "" $(TIMEOUT_PROGRAM): timeout.py rm -rf install-inplace @@ -24,7 +27,7 @@ $(TIMEOUT_PROGRAM): timeout.hs rm -rf install-inplace $(TEST_HC) --make Setup ./Setup configure --with-compiler=$(TEST_HC) --with-hc-pkg=$(GHC_PKG) \ - --ghc-option=-threaded --prefix=$(abspath install-inplace) + --ghc-option=-threaded --prefix=$(PREFIX) ./Setup build ./Setup install endif |