From 795d85f36e27e8ff8fe02b11a814df999dc2a7e4 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sun, 29 Jan 2012 18:36:51 +0000
Subject: [PATCH] tools: update/simplify make install

---
 Makefile | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index 4db83837f..d2973b24b 100644
--- a/Makefile
+++ b/Makefile
@@ -114,34 +114,18 @@ default: tag bin/hledger
 ######################################################################
 # BUILDING
 
-# set version numbers, fetch dependencies, build and install standard binaries
-# and libs from all hledger packages. A good thing to run first; the other
-# allcabal rules require hledger-VERSION and hledger-lib-VERSION installed.
-# You may want to change the version number in VERSION file first.
-install: allcabalinstall
+# cabal install all hledger PACKAGES and dependencies in the proper order
+# (or, as many as possible)
+install:
+	cabal install $(patsubst %,./%,$(PACKAGES))
 
-# set version numbers and configure all hledger packages
-configure: allcabalconfigure
+# # 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
 
-# set version numbers and build all hledger packages
-build: allcabalbuild
-
-# set version numbers and cabal test all hledger packages
-cabaltest: allcabaltest
-
-installdepsdry:
-	for p in $(PACKAGES); do (echo "$$p: cabal install --only-dependencies --dry"; cd $$p; cabal install --only-dependencies --dry); done
-
-installdeps:
-	for p in $(PACKAGES); do (echo "$$p: cabal install --only-dependencies"; cd $$p; cabal install --only-dependencies); 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%:
-	for p in $(PACKAGES); do (echo doing $* in $$p; cd $$p; $*); done
+# # run a command in all hledger package dirs
+# all%:
+# 	for p in $(PACKAGES); do (echo doing $* in $$p; cd $$p; $*); done
 
 # auto-recompile and run (something, eg --help or unit tests) whenever a module changes