[commit: ghc] master: Build system: Tell hsc2hs where to find cabal_macros.h (78d8681)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/78d8681a39e2bd4a8e35b921a37cd77f4c94c8e2

>---------------------------------------------------------------

commit 78d8681a39e2bd4a8e35b921a37cd77f4c94c8e2
Author: Ian Lynagh <igloo at earth.li>
Date:   Wed Apr 27 00:19:09 2011 +0100

    Build system: Tell hsc2hs where to find cabal_macros.h

>---------------------------------------------------------------

 rules/distdir-way-opts.mk |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk
index 494e171..5c56169 100644
--- a/rules/distdir-way-opts.mk
+++ b/rules/distdir-way-opts.mk
@@ -134,6 +134,8 @@ $1_$2_$3_ALL_HSC2HS_OPTS = \
  --cflag=-D__GLASGOW_HASKELL__=$$(ProjectVersionInt) \
  $$($1_$2_$3_HSC2HS_CC_OPTS) \
  $$($1_$2_$3_HSC2HS_LD_OPTS) \
+ --cflag=-I$1/$2/build/autogen \
+ $$(if $$($1_PACKAGE),--cflag=-include --cflag=$1/$2/build/autogen/cabal_macros.h) \
  $$($$(basename $$<)_HSC2HS_OPTS) \
  $$(EXTRA_HSC2HS_OPTS)