From 4da22cd8461a31db915ed39420fb32a3d2fc55ba Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Sun, 28 Jun 2015 14:18:23 -0700 Subject: [PATCH] tools: tweak some cabal make rules --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d26bf9135..99e7712ca 100644 --- a/Makefile +++ b/Makefile @@ -304,13 +304,15 @@ bin/hledgerdev.ghcall: \ build hledger with the main supported GHC versions\ ) +#CABALINSTALLDIR=~/.cabal +CABALINSTALLDIR=.cabal-sandbox bin/hledger: \ $(call def-help,bin/hledger,\ - build the "production" optimised cabal build with profiling enabled. Assumes a cabal sandbox.\ + build the "production" optimised cabal build with profiling enabled.\ ) rm -f bin/hledger cabal install --disable-profiling ./hledger-lib ./hledger \ - && mv .cabal-sandbox/bin/hledger bin/hledger + && mv $(CABALINSTALLDIR)/bin/hledger bin/hledger bin/hledger-prof: \ $(call def-help,bin/hledger-prof,\ @@ -318,7 +320,7 @@ bin/hledger-prof: \ ) rm -f bin/hledger-prof cabal install --enable-profiling --ghc-options=-fprof-auto ./hledger-lib ./hledger \ - && mv .cabal-sandbox/bin/hledger bin/hledger-prof + && mv $(CABALINSTALLDIR)/bin/hledger bin/hledger-prof # build the dev build with profiling enabled. # not working with cabal sandbox