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:
682d5e9
)
Cabal upstream API change -- installPackage to use installDirTemplates
author
Clemens Fruhwirth
<clemens@endorphin.org>
Fri, 24 Aug 2007 18:13:25 +0000
(18:13 +0000)
committer
Clemens Fruhwirth
<clemens@endorphin.org>
Fri, 24 Aug 2007 18:13:25 +0000
(18:13 +0000)
libraries/installPackage.hs
patch
|
blob
|
history
diff --git
a/libraries/installPackage.hs
b/libraries/installPackage.hs
index
866b0e8
..
d8f4fbc
100644
(file)
--- a/
libraries/installPackage.hs
+++ b/
libraries/installPackage.hs
@@
-54,12
+54,12
@@
doit pref ghcpkg verbosity =
pd_reg = pd { library = Just (mkLib (const True)) }
-- When coying, we need to actually give a concrete
-- directory to copy to rather than "$topdir"
pd_reg = pd { library = Just (mkLib (const True)) }
-- When coying, we need to actually give a concrete
-- directory to copy to rather than "$topdir"
- lbi_copy = lbi { prefix = pref }
+ lbi_copy = lbi { installDirTemplates = (installDirTemplates lbi) { prefixDirTemplate = toPathTemplate pref } }
-- When we run GHC we give it a $topdir that includes the
-- $compiler/lib/ part of libsubdir, so we only want the
-- $pkgid part in the package.conf file. This is a bit of
-- a hack, really.
-- When we run GHC we give it a $topdir that includes the
-- $compiler/lib/ part of libsubdir, so we only want the
-- $pkgid part in the package.conf file. This is a bit of
-- a hack, really.
- lbi_reg = lbi { libsubdir = "$pkgid" }
+ lbi_reg = lbi { installDirTemplates = (installDirTemplates lbi) { libSubdirTemplate = toPathTemplate "$pkgid" } }
(copyHook simpleUserHooks) pd_copy lbi_copy userHooks copyFlags
(regHook simpleUserHooks) pd_reg lbi_reg userHooks registerFlags
return ()
(copyHook simpleUserHooks) pd_copy lbi_copy userHooks copyFlags
(regHook simpleUserHooks) pd_reg lbi_reg userHooks registerFlags
return ()