X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FinstallPackage.hs;h=da04e3582114ceb1260ce8855d794cbbbef034d2;hb=eb64777602e77588cb781865f742fa23fad06d08;hp=466da21026c9fc01e70b6eb630786c1ce48fb823;hpb=aef7618ba5ec47a3c471ae9991f72d4e545bc6d5;p=ghc-hetmet.git

diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs
index 466da21..da04e35 100644
--- a/libraries/installPackage.hs
+++ b/libraries/installPackage.hs
@@ -1,16 +1,17 @@
 
 import Distribution.PackageDescription
-import Distribution.Setup
 import Distribution.Simple
 import Distribution.Simple.Configure
 import Distribution.Simple.LocalBuildInfo
+import Distribution.Simple.Program
+import Distribution.Simple.Setup
 import Distribution.Verbosity
 import System.Environment
 
 main :: IO ()
 main = do args <- getArgs
           case args of
-              pref : ghcpkg : args' ->
+              destdir : pref : ghcpkg : ghcpkgconf : args' ->
                   let verbosity = case args' of
                               [] -> normal
                               ['-':'v':v] ->
@@ -19,22 +20,26 @@ main = do args <- getArgs
                                               _ -> Just v
                                   in flagToVerbosity m
                               _ -> error ("Bad arguments: " ++ show args)
-                  in doit pref ghcpkg verbosity
+                  in doit destdir pref ghcpkg ghcpkgconf verbosity
               _ ->
                   error "Missing arguments"
 
-doit :: FilePath -> FilePath -> Verbosity -> IO ()
-doit pref ghcpkg verbosity =
+doit :: FilePath -> FilePath -> FilePath -> FilePath -> Verbosity -> IO ()
+doit destdir pref ghcpkg ghcpkgconf verbosity =
        do let userHooks = simpleUserHooks
-              copyFlags = (emptyCopyFlags NoCopyDest) {
+              copyto = if null destdir then NoCopyDest else CopyTo destdir
+              copyFlags = (emptyCopyFlags copyto) {
                               copyVerbose = verbosity
                           }
               registerFlags = emptyRegisterFlags {
                                   regUser = MaybeUserGlobal,
-                                  regVerbose = verbosity
+                                  regVerbose = verbosity,
+                                  regGenScript = False,
+                                  regInPlace = False
                               }
           lbi <- getPersistBuildConfig
           let pd = localPkgDescr lbi
+              i = installDirTemplates lbi
               -- XXX This is an almighty hack, shadowing the base
               -- Setup.hs hack
               mkLib filt = case library pd of
@@ -51,12 +56,23 @@ 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"
-              lbi_copy = lbi { prefix = pref }
+              i_copy = i { prefixDirTemplate = toPathTemplate pref }
+              lbi_copy = lbi { installDirTemplates = i_copy }
               -- 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" }
+              progs = withPrograms lbi
+              prog = ConfiguredProgram {
+                         programId = programName ghcPkgProgram,
+                         programVersion = Nothing,
+                         programArgs = ["--global-conf", ghcpkgconf],
+                         programLocation = UserSpecified ghcpkg
+                     }
+              progs' = updateProgram prog progs
+              i_reg = i { libSubdirTemplate = toPathTemplate "$pkgid" }
+              lbi_reg = lbi { installDirTemplates = i_reg,
+                              withPrograms = progs' }
           (copyHook simpleUserHooks) pd_copy lbi_copy userHooks copyFlags
           (regHook simpleUserHooks)  pd_reg  lbi_reg  userHooks registerFlags
           return ()