[commit: Cabal] master: Tell hsc2hs where to find cabal_macros.h (b24eca1)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/b24eca13a69e7257734b46b2d50576194f4d3a9c

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

commit b24eca13a69e7257734b46b2d50576194f4d3a9c
Author: Ian Lynagh <igloo at earth.li>
Date:   Tue Apr 26 21:05:49 2011 +0000

    Tell hsc2hs where to find cabal_macros.h

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

 Distribution/Simple/PreProcess.hs |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Distribution/Simple/PreProcess.hs b/Distribution/Simple/PreProcess.hs
index 5c6ffe3..87665c0 100644
--- a/Distribution/Simple/PreProcess.hs
+++ b/Distribution/Simple/PreProcess.hs
@@ -454,7 +454,9 @@ ppHsc2hs bi lbi =
        ++ [ "--cflag=" ++ opt
           | pkg <- pkgs
           , opt <- [ "-I" ++ opt | opt <- Installed.includeDirs pkg ]
-                ++ [         opt | opt <- Installed.ccOptions   pkg ] ]
+                ++ [         opt | opt <- Installed.ccOptions   pkg ]
+                ++ [ "-I" ++ autogenModulesDir lbi,
+                     "-include", autogenModulesDir lbi </> cppHeaderName ] ]
        ++ [ "--lflag=" ++ opt
           | pkg <- pkgs
           , opt <- [ "-L" ++ opt | opt <- Installed.libraryDirs    pkg ]