From eaadc927a715ab5b95da85fde20a81289c1d7174 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 30 Dec 2016 14:33:14 -0800
Subject: [PATCH] tools: fix ugly warnings after using multiple cabal versions

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

diff --git a/Makefile b/Makefile
index ab9b28884..5b158a2a1 100644
--- a/Makefile
+++ b/Makefile
@@ -191,10 +191,10 @@ WARNINGS:=\
 # GHCMEMFLAGS= #+RTS -M200m -RTS
 
 # ghc builds need the macro definitions generated by cabal
-# from cabal's dist or dist-sandbox, hopefully there's just one
+# from cabal's dist or dist-sandbox dir, hopefully there's just one
 #CABALMACROSFLAGS=-optP-include -optP hledger/dist*/build/autogen/cabal_macros.h
-# from stack's dist, hopefully there's just one
-CABALMACROSFLAGS=-optP-include -optP hledger/.stack-work/dist/*/*/build/autogen/cabal_macros.h
+# from stack's dist dir, hopefully there's just one. If not (after cabal upgrade), will get warnings. Maybe obsolete ?
+#CABALMACROSFLAGS=-optP-include -optP hledger/.stack-work/dist/*/*/build/autogen/cabal_macros.h
 
 BUILDFLAGS1:=-rtsopts $(WARNINGS) $(INCLUDEPATHS) $(PREFERMACUSRLIBFLAGS) $(GHCMEMFLAGS) $(CABALMACROSFLAGS) -DPATCHLEVEL=$(PATCHLEVEL) -DDEVELOPMENT
 BUILDFLAGS:=$(BUILDFLAGS1) -DVERSION='"$(VERSION)dev"'