X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FinstallPackage.hs;h=461542956033f7dfd99ba4fbd53ce8618292b614;hp=371604b13171e9e172395d6a382e9972cef7a0d8;hb=f5edc6b0871a0debbc9a64f4cdb95c0dc35e5b16;hpb=1286d3e9d7c0ce82cf3451983139902b70fce7b5

diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs
index 371604b..4615429 100644
--- a/libraries/installPackage.hs
+++ b/libraries/installPackage.hs
@@ -17,12 +17,12 @@ main
                let verbosity = mkVerbosity args'
                in doRegisterInplace verbosity
            "install" : ghcpkg : ghcpkgconf : destdir : topdir :
-                    iprefix : ibindir : ilibdir : ilibexecdir :
+                    iprefix : ibindir : ilibdir : ilibexecdir : idynlibdir :
                     idatadir : idocdir : ihtmldir : ihaddockdir :
                     args' ->
                let verbosity = mkVerbosity args'
                in doInstall verbosity ghcpkg ghcpkgconf destdir topdir
-                            iprefix ibindir ilibdir ilibexecdir idatadir
+                            iprefix ibindir ilibdir ilibexecdir idynlibdir idatadir
                             idocdir ihtmldir ihaddockdir
            _ ->
                error ("Bad arguments: " ++ show args)
@@ -40,7 +40,7 @@ doRegisterInplace verbosity =
        do lbi <- getConfig verbosity
           let registerFlags = defaultRegisterFlags { regInPlace = toFlag True }
               pd = localPkgDescr lbi
-              pd_reg = if pkgName (package pd) == "base"
+              pd_reg = if pkgName (package pd) == "ghc-prim"
                        then case library pd of
                             Just lib ->
                                 let ems = "GHC.Prim" : exposedModules lib
@@ -54,10 +54,10 @@ doRegisterInplace verbosity =
 
 doInstall :: Verbosity -> FilePath -> FilePath -> FilePath -> FilePath
           -> FilePath -> FilePath -> FilePath -> FilePath -> FilePath
-          -> FilePath -> FilePath -> FilePath
+          -> FilePath -> FilePath -> FilePath -> FilePath
           -> IO ()
 doInstall verbosity ghcpkg ghcpkgconf destdir topdir
-     iprefix ibindir ilibdir ilibexecdir idatadir
+     iprefix ibindir ilibdir ilibexecdir idynlibdir idatadir
      idocdir ihtmldir ihaddockdir =
        do let userHooks = simpleUserHooks
               copyto = if null destdir then NoCopyDest else CopyTo destdir
@@ -75,9 +75,9 @@ doInstall verbosity ghcpkg ghcpkgconf destdir topdir
           let pd = localPkgDescr lbi
               i = installDirTemplates lbi
               -- This is an almighty hack. We need to register
-              -- base:GHC.Prim, but it doesn't exist, get built, get
+              -- ghc-prim:GHC.Prim, but it doesn't exist, get built, get
               -- haddocked, get copied, etc.
-              pd_reg = if pkgName (package pd) == "base"
+              pd_reg = if pkgName (package pd) == "ghc-prim"
                        then case library pd of
                             Just lib ->
                                 let ems = "GHC.Prim" : exposedModules lib
@@ -92,6 +92,7 @@ doInstall verbosity ghcpkg ghcpkgconf destdir topdir
               i_copy = i { prefix       = toPathTemplate' iprefix,
                            bindir       = toPathTemplate' ibindir,
                            libdir       = toPathTemplate' ilibdir,
+                           dynlibdir    = toPathTemplate' idynlibdir,
                            libexecdir   = toPathTemplate' ilibexecdir,
                            datadir      = toPathTemplate' idatadir,
                            docdir       = toPathTemplate' idocdir,
@@ -114,6 +115,7 @@ doInstall verbosity ghcpkg ghcpkgconf destdir topdir
               i_reg = i { prefix       = toPathTemplate iprefix,
                           bindir       = toPathTemplate ibindir,
                           libdir       = toPathTemplate ilibdir,
+                          dynlibdir    = toPathTemplate idynlibdir,
                           libexecdir   = toPathTemplate ilibexecdir,
                           datadir      = toPathTemplate idatadir,
                           docdir       = toPathTemplate idocdir,