X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FinstallPackage.hs;h=df2a9e20d39950ed5af981ba981bf05b1853e510;hb=e4fa0854318cde1a317727ab3d29edc0ca772e9d;hp=371604b13171e9e172395d6a382e9972cef7a0d8;hpb=1286d3e9d7c0ce82cf3451983139902b70fce7b5;p=ghc-hetmet.git diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs index 371604b..df2a9e2 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) @@ -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 @@ -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,