[Yet another attempt to get the paths for the installed documentation correct
sven.panne@aedion.de**20070909124922
 MERGE TO STABLE
] {
hunk ./docs/index.html 33
-          <B><A HREF="libraries/html/index.html">Libraries</A></B>
+          <B><A HREF="libraries/index.html">Libraries</A></B>
hunk ./libraries/Makefile 94
-libraryhtmldir = $(htmldir)/libraries
-
hunk ./libraries/Makefile 220
-	           --datasubdir='$$pkgid' \
hunk ./libraries/Makefile 221
-	           --docdir='$(libraryhtmldir)' \
hunk ./libraries/Makefile 299
-DESTlibraryhtmldir = $(DESTDIR)$(libraryhtmldir)/html
+libraryhtmldir = $(htmldir)/libraries
hunk ./libraries/Makefile 303
-	$(INSTALL_DIR)                                      $(DESTlibraryhtmldir)
-	$(INSTALL_DATA)   index.html doc-index.html         $(DESTlibraryhtmldir)
-	$(INSTALL_SCRIPT) gen_contents_index                $(DESTlibraryhtmldir)
+	$(INSTALL_DIR)                                           $(DESTDIR)$(libraryhtmldir)
+	$(INSTALL_DATA)   index.html doc-index.html              $(DESTDIR)$(libraryhtmldir)
+	$(INSTALL_SCRIPT) gen_contents_index                     $(DESTDIR)$(libraryhtmldir)
hunk ./libraries/Makefile 307
-	$(INSTALL_DATA)   $(DESTlibraryhtmldir)/base/*.css $(DESTlibraryhtmldir)
-	$(INSTALL_DATA)   $(DESTlibraryhtmldir)/base/*.js  $(DESTlibraryhtmldir)
-	$(INSTALL_DATA)   $(DESTlibraryhtmldir)/base/*.gif $(DESTlibraryhtmldir)
+	$(INSTALL_DATA)   $(DESTDIR)$(libraryhtmldir)/base/*.css $(DESTDIR)$(libraryhtmldir)
+	$(INSTALL_DATA)   $(DESTDIR)$(libraryhtmldir)/base/*.js  $(DESTDIR)$(libraryhtmldir)
+	$(INSTALL_DATA)   $(DESTDIR)$(libraryhtmldir)/base/*.gif $(DESTDIR)$(libraryhtmldir)
hunk ./libraries/Makefile 323
-	  ../installPackage/installPackage "$(DESTDIR)" "$(prefix)" "$(datadir)" "$(libraryhtmldir)" "$(GHC_PKG_PROG)" "$(DESTDIR)$(libdir)/package.conf" ; \
+	  ../installPackage/installPackage "$(DESTDIR)" "$(prefix)" "$(datadir)" "$(libraryhtmldir)/$*" "$(libraryhtmldir)" "$(GHC_PKG_PROG)" "$(DESTDIR)$(libdir)/package.conf" ; \
hunk ./libraries/installPackage.hs 16
-           destdir : pref : idatadir : idocdir : ghcpkg : ghcpkgconf : args' ->
+           destdir : pref : idatadir : idocdir : ihtmldir : ghcpkg : ghcpkgconf : args' ->
hunk ./libraries/installPackage.hs 25
-               in doit destdir pref idatadir idocdir ghcpkg ghcpkgconf
+               in doit destdir pref idatadir idocdir ihtmldir ghcpkg ghcpkgconf
hunk ./libraries/installPackage.hs 30
-doit :: FilePath -> FilePath -> FilePath -> FilePath -> FilePath -> FilePath
+doit :: FilePath -> FilePath -> FilePath -> FilePath -> FilePath -> FilePath -> FilePath
hunk ./libraries/installPackage.hs 33
-doit destdir pref idatadir idocdir ghcpkg ghcpkgconf verbosity =
+doit destdir pref idatadir idocdir ihtmldir ghcpkg ghcpkgconf verbosity =
hunk ./libraries/installPackage.hs 66
-                           docDirTemplate    = toPathTemplate idocdir
+                           docDirTemplate    = toPathTemplate idocdir,
+                           htmlDirTemplate   = toPathTemplate ihtmldir
}