[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 3d37eefe7eb688bca28168edb0b0367578697f5b
Author: John Goerzen <jgoerzen at complete.org>
Date:   Fri Dec 1 03:32:12 2006 +0100

    Simplify Setup.hs

diff --git a/Setup.hs b/Setup.hs
index 8481129..e9077ab 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -6,8 +6,8 @@ import Distribution.Version
 import System.Info
 import Data.Maybe
 
-winHooks = defaultUserHooks {confHook = customConfHook,
-                             buildHook = customBuildHook}
+missingHooks = defaultUserHooks {confHook = customConfHook}
+                                }
 
 customConfHook descrip flags =
     let mydescrip = case System.Info.os of
@@ -17,16 +17,5 @@ customConfHook descrip flags =
                                         buildDepends descrip}
     in (confHook defaultUserHooks) mydescrip flags
 
-customBuildHook descrip lbi uh flags =
-    let myexecutables = map bdfix (executables descrip)
-        bdfix exe = 
-            exe {buildInfo = 
-                     (buildInfo exe) 
-                       {otherModules = 
-                            exposedModules . fromJust . library $ descrip}}
-        mydescrip = descrip {executables = myexecutables}
-    in do print mydescrip
-          (buildHook defaultUserHooks) mydescrip lbi uh flags
-                                                          
-main = defaultMainWithHooks winHooks
+main = defaultMainWithHooks missingHooks
 

-- 
haskell-testpack