Merge pull request #4866 from zw3rk/feature/header-from-buildpref

Look for install includes in buildpref as well

Author: 23Skidoo

Cabal/Distribution/Simple/Install.hs

@@ -171,7 +171,7 @@ copyComponent verbosity pkg_descr lbi (CLib lib) clbi copydest = do
 
     -- install include files for all compilers - they may be needed to compile
     -- haskell files (using the CPP extension)
-    installIncludeFiles verbosity lib incPref
+    installIncludeFiles verbosity lib buildPref incPref
 
     case compilerFlavor (compiler lbi) of
       GHC   -> GHC.installLib   verbosity lbi libPref dynlibPref buildPref pkg_descr lib clbi
@@ -247,11 +247,12 @@ installDataFiles verbosity pkg_descr destDataDir =
 
 -- | Install the files listed in install-includes for a library
 --
-installIncludeFiles :: Verbosity -> Library -> FilePath -> IO ()
-installIncludeFiles verbosity lib destIncludeDir = do
+installIncludeFiles :: Verbosity -> Library -> FilePath -> FilePath -> IO ()
+installIncludeFiles verbosity lib buildPref destIncludeDir = do
     let relincdirs = "." : filter isRelative (includeDirs lbi)
         lbi = libBuildInfo lib
-    incs <- traverse (findInc relincdirs) (installIncludes lbi)
+        incdirs = relincdirs ++ [ buildPref </> dir | dir <- relincdirs ]
+    incs <- traverse (findInc incdirs) (installIncludes lbi)
     sequence_
       [ do createDirectoryIfMissingVerbose verbosity True destDir
            installOrdinaryFile verbosity srcFile destFile

Cabal/changelog

@@ -1,6 +1,9 @@
 -*-change-log-*-
 
 2.2.0.0 (current development version)
+	* `copyCompomenti` and `installIncludeFiles` will look for include
+	  headers in the build preference dir ('dist/build/...' by default)
+	  as well.
 	* Added cxx-options and cxx-sources build info fields for seperate
 	  compilation of C++ source files (#3700)
 	* Remove unused '--allow-newer'/'--allow-older' support (#4527)