projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
814d2f5
)
Follow distPref changes in Cabal
author
Ian Lynagh
<igloo@earth.li>
Sun, 11 May 2008 14:45:39 +0000
(14:45 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Sun, 11 May 2008 14:45:39 +0000
(14:45 +0000)
libraries/installPackage.hs
patch
|
blob
|
history
diff --git
a/libraries/installPackage.hs
b/libraries/installPackage.hs
index
3ab4f7e
..
2a13e0b
100644
(file)
--- a/
libraries/installPackage.hs
+++ b/
libraries/installPackage.hs
@@
-11,6
+11,10
@@
import Distribution.Simple.Utils
import Distribution.Verbosity
import System.Environment
import Distribution.Verbosity
import System.Environment
+-- XXX This will need to be changed
+distPref :: FilePath
+distPref = defaultDistPref
+
main :: IO ()
main
= do args <- getArgs
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
-- 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
maybe_infoFile <- defaultHookedPackageDesc
case maybe_infoFile of
Nothing -> return lbi