Commit a2ab5544 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Remove uses of pwd in favour of abspath

parent 15a27e50
......@@ -12,4 +12,4 @@ config :
@echo "Creating $(CONFIG_HS) ... "
@echo "module Config where" >>$(CONFIG_HS)
@echo "cTop :: String" >> $(CONFIG_HS)
@echo "cTop = \""`cd $(TOP) && cd .. && pwd`"\"" >> $(CONFIG_HS)
\ No newline at end of file
@echo "cTop = \""`$(TEST_HC) --print-libdir`"\"" >> $(CONFIG_HS)
\ No newline at end of file
......@@ -23,7 +23,7 @@ cabal01:
$(MAKE) clean
$(TEST_HC) --make -o setup Setup.lhs -v0
./setup configure -v0 --prefix=$(shell $(TOP)/utils/pwd forwardslash)/install --with-compiler=$(TEST_HC) --with-hc-pkg=$(GHC_PKG) $(PROF)
./setup configure -v0 --prefix=$(abspath install) --with-compiler=$(TEST_HC) --with-hc-pkg=$(GHC_PKG) $(PROF)
./setup build -v0
./setup copy -v0
echo install1:
......
CWD=${shell pwd}
TOP=${CWD}/../../../..
TOP=../../../..
include $(TOP)/mk/boilerplate.mk
include $(TOP)/mk/test.mk
......
......@@ -17,7 +17,7 @@ include $(TOP)/mk/test.mk
rn.prog006:
$(TEST_HC) --make -package-name test-1.0 B.C -fforce-recomp -v0
sed "s@__IMPORT__@`$(TOP)/utils/pwd quadruple-backslash`@" <pkg.conf.in >pkg.conf
sed "s@__IMPORT__@$(abspath .)@" <pkg.conf.in >pkg.conf
$(TEST_HC) -c -package-conf pkg.conf -package test -fforce-recomp A.hs -i
# The -i clears the search path, so A.hs will find B.C from package test
#
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment