From: Ian Lynagh <igloo@earth.li>
Date: Thu, 13 Sep 2007 17:42:42 +0000 (+0000)
Subject: More library installation path fiddling
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=7022469ab84b59f18ce4ad0dbae2b81b5274a2b9

More library installation path fiddling
---

diff --git a/libraries/Makefile b/libraries/Makefile
index b06c0ca..240bcc8 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -336,7 +336,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: installPackage/installPackage ifBuildable/ifBuildable
 	if ifBuildable/ifBuildable $*; then \
 	  cd $* && \
-	  ../installPackage/installPackage '$(DESTDIR)' '$(prefix)' '$(bindir)' '$(libdir)' '$(libexecdir)' '$(datadir)' '$(docdir)' '$(htmldir_install)' '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' ; \
+	  ../installPackage/installPackage '$(DESTDIR)' '$(prefix)' '$(bindir)' '$(libdir)' '$(libexecdir)' '$(datadir)' '$(docdir)' '$(htmldir_install)' '$(htmldir_configure)' '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' ; \
 	fi
 
 .PHONY: binary-dist binary-dist.library.%
diff --git a/libraries/installPackage.hs b/libraries/installPackage.hs
index 0fd35c2..475a55e 100644
--- a/libraries/installPackage.hs
+++ b/libraries/installPackage.hs
@@ -13,8 +13,8 @@ main :: IO ()
 main
   = do args <- getArgs
        case args of
-           destdir : pref : ibindir : ilibdir : ilibexecdir
-                   : idatadir : idocdir : ihtmldir
+           destdir : ipref : ibindir : ilibdir : ilibexecdir
+                   : idatadir : idocdir : ihtmldir_copy : ihtmldir_reg
                    : ghcpkg : ghcpkgconf : args' ->
                let verbosity = case args' of
                            [] -> normal
@@ -24,18 +24,20 @@ main
                                            _ -> Just v
                                in flagToVerbosity m
                            _ -> error ("Bad arguments: " ++ show args)
-               in doit destdir pref ibindir ilibdir ilibexecdir idatadir
-                       idocdir ihtmldir
+               in doit destdir ipref ibindir ilibdir
+                       ilibexecdir idatadir idocdir
+                       ihtmldir_copy ihtmldir_reg
                        ghcpkg ghcpkgconf verbosity
            _ ->
                error "Missing arguments"
 
 doit :: FilePath -> FilePath -> FilePath -> FilePath -> FilePath
      -> FilePath -> FilePath -> FilePath -> FilePath -> FilePath
+     -> FilePath
      -> Verbosity
      -> IO ()
-doit destdir pref ibindir ilibdir ilibexecdir idatadir idocdir
-     ihtmldir ghcpkg ghcpkgconf verbosity =
+doit destdir ipref ibindir ilibdir ilibexecdir idatadir idocdir
+     ihtmldir_copy ihtmldir_reg ghcpkg ghcpkgconf verbosity =
        do let userHooks = simpleUserHooks
               copyto = if null destdir then NoCopyDest else CopyTo destdir
               copyFlags = (emptyCopyFlags copyto) {
@@ -66,13 +68,13 @@ doit destdir pref ibindir ilibdir ilibexecdir idatadir idocdir
               pd_reg  = pd { library = Just (mkLib (const True)) }
               -- When coying, we need to actually give a concrete
               -- directory to copy to rather than "$topdir"
-              i_copy = i { prefixDirTemplate  = toPathTemplate pref,
+              i_copy = i { prefixDirTemplate  = toPathTemplate ipref,
                            binDirTemplate     = toPathTemplate ibindir,
                            libDirTemplate     = toPathTemplate ilibdir,
                            libexecDirTemplate = toPathTemplate ilibexecdir,
                            dataDirTemplate    = toPathTemplate idatadir,
                            docDirTemplate     = toPathTemplate idocdir,
-                           htmlDirTemplate    = toPathTemplate ihtmldir
+                           htmlDirTemplate    = toPathTemplate ihtmldir_copy
                          }
               lbi_copy = lbi { installDirTemplates = i_copy }
               -- When we run GHC we give it a $topdir that includes the
@@ -87,7 +89,14 @@ doit destdir pref ibindir ilibdir ilibexecdir idatadir idocdir
                          programLocation = UserSpecified ghcpkg
                      }
               progs' = updateProgram prog progs
-              i_reg = i { libSubdirTemplate = toPathTemplate "$pkgid" }
+              i_reg = i { prefixDirTemplate  = toPathTemplate ipref,
+                          binDirTemplate     = toPathTemplate ibindir,
+                          libDirTemplate     = toPathTemplate ilibdir,
+                          libexecDirTemplate = toPathTemplate ilibexecdir,
+                          dataDirTemplate    = toPathTemplate idatadir,
+                          docDirTemplate     = toPathTemplate idocdir,
+                          htmlDirTemplate    = toPathTemplate ihtmldir_reg
+                        }
               lbi_reg = lbi { installDirTemplates = i_reg,
                               withPrograms = progs' }
           (copyHook simpleUserHooks) pd_copy lbi_copy userHooks copyFlags