From 3fb5ff3dbd3e99aa799c4f2dd51110d9f7fa004c Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 19 Nov 2010 17:37:28 +0000
Subject: [PATCH] tools: makefile

---
 Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 242889651..35adcf64d 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,6 @@ SOURCEFILES:= \
 	$(MAIN) \
 	hledger/*hs \
 	hledger/Hledger/Cli/*hs \
-	hledger/Hledger/Cli/Commands/*hs \
 	hledger-*/*hs \
 	hledger-*/Hledger/*hs \
 	hledger-*/Hledger/*/*hs
@@ -73,7 +72,7 @@ VERSIONSENSITIVEFILES=\
 	DOWNLOAD.markdown \
 	$(CABALFILES) \
 
-default: tag install
+default: tag hledger
 
 ######################################################################
 # BUILDING
@@ -108,7 +107,7 @@ autotest: setversion
 	sp --no-exts --no-default-map -o bin/hledger ghc --make $(MAIN) -ihledger $(BUILDFLAGS) --run test
 
 # as above for add-on programs
-autoweb: setversion hledgerwebdatalinks
+autoweb: setversion linkhledgerwebdir
 	rm -f bin/hledger-web
 	sp --no-exts --no-default-map -o bin/hledger-web ghc --make hledger-web/hledger-web.hs -ihledger-web -ihledger $(BUILDFLAGS) --run --debug
 
@@ -120,9 +119,11 @@ autochart: setversion
 	rm -f bin/hledger-chart
 	sp --no-exts --no-default-map -o bin/hledger-chart ghc --make hledger-chart/hledger-chart.hs -ihledger-chart -ihledger $(BUILDFLAGS) --run --help
 
-# make symlinks to allow running hledger-web from the top directory
-hledgerwebdatalinks:
-	cd data; for f in ../hledger-web/data/*; do ln -sf $$f; done
+# make symlinks so that running hledger-web from the top directory will
+# use the in-development hledger-web support files. Cf Hledger.Web.Settings:
+HLEDGERDATADIR:=.hledger
+linkhledgerwebdir:
+	mkdir -p $(HLEDGERDATADIR); ln -sf ../hledger-web/$(HLEDGERDATADIR)/web $(HLEDGERDATADIR)/web
 
 # build the standalone unit test runner. Requires test-framework, which
 # may not work on windows.