From: Ian Lynagh Date: Sun, 11 May 2008 14:45:39 +0000 (+0000) Subject: Follow distPref changes in Cabal X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=21dc32bc3614edbd9155d9a95ff1e4875e2d1c59;hp=814d2f506d63f785dbfe33189dde606a06e60285;p=ghc-hetmet.git Follow distPref changes in Cabal --- diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs index 3ab4f7e..2a13e0b 100644 --- a/libraries/installPackage.hs +++ b/libraries/installPackage.hs @@ -11,6 +11,10 @@ import Distribution.Simple.Utils import Distribution.Verbosity import System.Environment +-- XXX This will need to be changed +distPref :: FilePath +distPref = defaultDistPref + main :: IO () main = do args <- getArgs @@ -136,7 +140,7 @@ replaceTopdir _ p = p -- Get the build info, merging the setup-config and buildinfo files. getConfig :: Verbosity -> IO LocalBuildInfo getConfig verbosity = do - lbi <- getPersistBuildConfig + lbi <- getPersistBuildConfig distPref maybe_infoFile <- defaultHookedPackageDesc case maybe_infoFile of Nothing -> return lbi