From 9728206f4a03a440fbf6f797064504f2ba67909d Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sat, 16 May 2015 07:22:29 -0700
Subject: [PATCH] tools: also recognize dist-sandbox in make rules (#253)

---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f76dbbaca..55060f1ba 100644
--- a/Makefile
+++ b/Makefile
@@ -140,7 +140,11 @@ WEBLANGEXTS:=\
 
 PREFERMACUSRLIBFLAGS=-L/usr/lib
 GHCMEMFLAGS= #+RTS -M200m -RTS
-CABALMACROSFLAGS=-optP-include -optPhledger/dist/build/autogen/cabal_macros.h
+
+# include the macro definitions generated by cabal build,
+# from either dist or dist-sandbox (hopefully you don't have both)
+CABALMACROSFLAGS=-optP-include -optP hledger/dist*/build/autogen/cabal_macros.h
+
 BUILDFLAGS1:=-rtsopts $(WARNINGS) $(INCLUDEPATHS) $(PREFERMACUSRLIBFLAGS) $(GHCMEMFLAGS) $(CABALMACROSFLAGS) -DPATCHLEVEL=$(PATCHLEVEL) -DDEVELOPMENT
 BUILDFLAGS:=$(BUILDFLAGS1) -DVERSION='"$(VERSION)dev"'
 PROFBUILDFLAGS:=-prof -fprof-auto -osuf hs_p