Follow Cabal changes in Setup.hs

[haskell-directory.git] / Setup.hs

diff --git a/Setup.hs b/Setup.hs
index ae4f600..8064d78 100644 (file)
--- a/Setup.hs
+++ b/Setup.hs
@@ -10,25 +10,25 @@ import Control.Monad
 import Data.List
 import Distribution.Simple
 import Distribution.PackageDescription
-import Distribution.PreProcess
 import Distribution.Setup
-import Distribution.Simple.Configure
 import Distribution.Simple.LocalBuildInfo
 import System.Environment
-import System.Exit
 
 main :: IO ()
 main = do args <- getArgs
           let (ghcArgs, args') = extractGhcArgs args
-              (configureArgs, args'') = extractConfigureArgs args'
+              (confArgs, args'') = extractConfigureArgs args'
               hooks = defaultUserHooks {
                   confHook = add_extra_deps
                            $ confHook defaultUserHooks,
-                  postConf = add_configure_options configureArgs
+                  postConf = add_configure_options confArgs
                            $ postConf defaultUserHooks,
                   buildHook = add_ghc_options ghcArgs
                             $ filter_modules_hook
                             $ buildHook defaultUserHooks,
+                  makefileHook = add_ghc_options ghcArgs
+                            $ filter_modules_hook
+                            $ makefileHook defaultUserHooks,
                   instHook = filter_modules_hook
                            $ instHook defaultUserHooks }
           withArgs args'' $ defaultMainWithHooks hooks
@@ -40,11 +40,11 @@ extractConfigureArgs :: [String] -> ([String], [String])
 extractConfigureArgs = extractPrefixArgs "--configure-option="
 
 extractPrefixArgs :: String -> [String] -> ([String], [String])
-extractPrefixArgs prefix args
+extractPrefixArgs the_prefix args
  = let f [] = ([], [])
        f (x:xs) = case f xs of
                       (wantedArgs, otherArgs) ->
-                          case removePrefix prefix x of
+                          case removePrefix the_prefix x of
                               Just wantedArg ->
                                   (wantedArg:wantedArgs, otherArgs)
                               Nothing ->
@@ -53,20 +53,20 @@ extractPrefixArgs prefix args
 
 removePrefix :: String -> String -> Maybe String
 removePrefix "" ys = Just ys
+removePrefix _  "" = Nothing
 removePrefix (x:xs) (y:ys)
  | x == y = removePrefix xs ys
  | otherwise = Nothing
 
-type Hook a = PackageDescription -> LocalBuildInfo -> Maybe UserHooks -> a
-           -> IO ()
+type Hook a = PackageDescription -> LocalBuildInfo -> UserHooks -> a -> IO ()
 type ConfHook = PackageDescription -> ConfigFlags -> IO LocalBuildInfo
 type PostConfHook = Args -> ConfigFlags -> PackageDescription -> LocalBuildInfo
-                 -> IO ExitCode
+                 -> IO ()
 
 -- type PDHook = PackageDescription -> ConfigFlags -> IO ()
 
 add_ghc_options :: [String] -> Hook a -> Hook a
-add_ghc_options args f pd lbi muhs x
+add_ghc_options args f pd lbi uhs x
  = do let lib' = case library pd of
                      Just lib ->
                          let bi = libBuildInfo lib
@@ -75,14 +75,14 @@ add_ghc_options args f pd lbi muhs x
                          in lib { libBuildInfo = bi' }
                      Nothing -> error "Expected a library"
           pd' = pd { library = Just lib' }
-      f pd' lbi muhs x
+      f pd' lbi uhs x
 
 add_configure_options :: [String] -> PostConfHook -> PostConfHook
 add_configure_options args f as cfs pd lbi
  = f (as ++ args) cfs pd lbi
 
 filter_modules_hook :: Hook a -> Hook a
-filter_modules_hook f pd lbi muhs x
+filter_modules_hook f pd lbi uhs x
  = let build_filter = case compilerFlavor $ compiler lbi of
                           GHC -> forGHCBuild
                           _ -> isPortableBuild
@@ -92,7 +92,7 @@ filter_modules_hook f pd lbi muhs x
                       in lib { exposedModules = ems }
                   Nothing -> error "Expected a library"
        pd' = pd { library = Just lib' }
-   in f pd' lbi muhs x
+   in f pd' lbi uhs x
 
 isPortableBuild :: String -> Bool
 isPortableBuild s