From f595c2ceedf78d32e19fe960c4025a70588a9a77 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Mon, 5 Mar 2012 07:23:35 +0000
Subject: [PATCH] tools: makefile updates

---
 Makefile | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 775509b6e..a1d561242 100644
--- a/Makefile
+++ b/Makefile
@@ -116,12 +116,13 @@ default: tag bin/hledger
 
 # cabal install all hledger PACKAGES and dependencies in the proper order
 # (or, as many as possible)
+EXTRAINSTALLARGS=
 install:
-	cabal install $(patsubst %,./%,$(PACKAGES))
+	cabal install $(patsubst %,./%,$(PACKAGES)) $(EXTRAINSTALLARGS)
 
-# # run a cabal command in all hledger package dirs
-# allcabal%:
-# 	for p in $(PACKAGES); do (echo doing cabal $* in $$p; cd $$p; cabal $*; echo); done
+# run a cabal command in all hledger package dirs
+allcabal%:
+	for p in $(PACKAGES); do (echo doing cabal $* in $$p; cd $$p; cabal $*; echo); done
 
 # # run a command in all hledger package dirs
 # all%:
@@ -135,7 +136,7 @@ auto: sp
 
 autoweb: sp
 	rm -f bin/hledger-web
-	cd hledger-web; $(AUTOBUILD) hledger-web.hs -o ../bin/hledger-web $(BUILDFLAGS) -DPRODUCTION=1 --run -B --port 5001 --base-url http://demo.hledger.org:5001 -f test.journal
+	cd hledger-web; $(AUTOBUILD) hledger-web.hs -o ../bin/hledger-web $(BUILDFLAGS) --run -B --port 5001 --base-url http://demo.hledger.org:5001 -f test.journal
 
 autovty: sp
 	rm -f bin/hledger-vty
@@ -730,9 +731,6 @@ setversion: $(VERSIONSENSITIVEFILES)
 Setversion:
 	touch $(VERSIONFILE); make setversion
 
-hledger/Hledger/Cli/Version.hs: $(VERSIONFILE)
-	perl -p -e "s/(^version *= *)\".*?\"/\1\"$(VERSION3)\"/" -i $@
-
 hledger-lib/hledger-lib.cabal: $(VERSIONFILE)
 	perl -p -e "s/(^ *version:) *.*/\1 $(VERSION)/" -i $@