1 files changed, 8 insertions, 31 deletions

diff --git a/Setup.lhs b/Setup.lhs
index 17efee4..ba435f0 100644
--- a/Setup.lhs
+++ b/Setup.lhs
@@ -1,43 +1,20 @@
 #! /usr/bin/env runhaskell
 
 > import Distribution.Simple
-> import System.Process(system)
->
-> import Config(config)
->
 > import Distribution.Simple.Setup
 > import Distribution.PackageDescription
 > import Distribution.Simple.LocalBuildInfo
-> import Distribution.Simple.Command
-> import Distribution.PackageDescription.Parse
-> import Distribution.Simple.Utils(info)
-> import Distribution.Verbosity
-
-> main = do
->    defaultMainWithHooks autoconfUserHooks {
->        runTests = t, 
->        postConf = modifiedPostConf }
->   where modifiedPostConf :: Args -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO ()
->         modifiedPostConf args flags pkg_descr lbi
->              = do let verbosity = fromFlag (configVerbosity flags)
->                   noExtraFlags args
->
->                   config
->
->                   pbi <- getHookedBuildInfo verbosity
->                   let pkg_descr' = updatePackageDescription pbi pkg_descr
->                   postConf simpleUserHooks args flags pkg_descr' lbi
 
+> import System.Process(system)
+> import Config(config)
 
-> getHookedBuildInfo :: Verbosity -> IO HookedBuildInfo
-> getHookedBuildInfo verbosity = do
->   maybe_infoFile <- defaultHookedPackageDesc
->   case maybe_infoFile of
->     Nothing       -> return emptyHookedBuildInfo
->     Just infoFile -> do
->       info verbosity $ "Reading parameters from " ++ infoFile
->       readHookedBuildInfo verbosity infoFile
+> main = defaultMainWithHooks simpleUserHooks { confHook = c, runTests = t }
 
+> c x y = do
+>     binfo <- confHook simpleUserHooks x y
+>     pbi <- config binfo
+>     let pkg_descr = localPkgDescr binfo
+>     return $ binfo { localPkgDescr = updatePackageDescription pbi pkg_descr }
 
 > t _ _ _ _ = system ( "runhaskell examples/tests.hs") >> return()