From 9998d51aec3748f8e77907a6bd28f542258cdffe Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sun, 18 Jul 2010 00:08:30 +0000
Subject: [PATCH] tools: more binary-building cleanup

---
 Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 4493eff3e..05307f352 100644
--- a/Makefile
+++ b/Makefile
@@ -102,21 +102,21 @@ hledgercov: setversion
 hledgeropt: setversion
 	ghc --make hledger.hs -o bin/hledgeropt $(BUILDFLAGS) -O2 # -fvia-C # -fexcess-precision -optc-O3 -optc-ffast-math
 
-# build a deployable binary for mac, one which uses only standard osx libs
-hledgermac: setversion
-	ghc --make hledger.hs -o bin/$(BINARYFILENAME) $(BUILDFLAGS) -O2 # -optl-L/usr/lib
-	@echo Please check the build looks portable:
-	otool -L bin/$(BINARYFILENAME)
-
 # build a deployable binary for gnu/linux, statically linked
 hledgerlinux: setversion
 	ghc --make hledger.hs -o bin/$(BINARYFILENAME) $(BUILDFLAGS) -O2 -static -optl-static -optl-pthread
 	@echo Please check the build looks portable (static):
 	-file bin/$(BINARYFILENAME)
 
-# build a deployable binary for windows, using cygwin presumably
-# hledgerwin: setversion
-# 	ghc --make hledger.hs -o bin/hledgerlinux $(BUILDFLAGS) -O2 -static -optl-static -optl-pthread
+# build a deployable binary for mac, using only standard osx libs
+hledgermac: setversion
+	ghc --make hledger.hs -o bin/$(BINARYFILENAME) $(BUILDFLAGS) -O2 # -optl-L/usr/lib
+	@echo Please check the build looks portable:
+	otool -L bin/$(BINARYFILENAME)
+
+# build a deployable binary for windows, running make via cygwin presumably
+hledgerwin: setversion hledgercabal
+	cp ~/.cabal/bin/hledger.exe bin/$(BINARYFILENAME)
 
 # auto-recompile and run (with the specified argument) whenever a module changes.
 # sp is from searchpath.org, you might need the patched version from