[Fix where all the documentation gets installed
Ian Lynagh <igloo@earth.li>**20070830223740
 The paths can also now be overridden with the standard configure flags
 --docdir=, --htmldir= etc. We were always advertising these, but now we
 actually obey them.
] {
hunk ./docs/Makefile 9
-	$(INSTALL_DIR) $(datadir)/html
-	$(INSTALL_DATA) $(INSTALL_OPTS) $(PAGES) $(datadir)/html
+	$(INSTALL_DIR) 							 $(htmldir)
+	$(INSTALL_DATA) $(INSTALL_OPTS) $(PAGES) $(htmldir)
hunk ./docs/index.html 23
-          <B><A HREF="users_guide/index.html">The User's Guide</A></B>
+          <B><A HREF="users_guide/html/index.html">The User's Guide</A></B>
hunk ./docs/index.html 33
-          <B><A HREF="libraries/index.html">Libraries</A></B>
+          <B><A HREF="libraries/html/index.html">Libraries</A></B>
hunk ./docs/index.html 42
-	  <B><A HREF="Cabal/index.html">Cabal</A></B>
+	  <B><A HREF="Cabal/html/index.html">Cabal</A></B>
hunk ./docs/index.html 58
+
hunk ./libraries/Makefile 189
-# We explicitly set datadir to "$prefix/share" as, while that is the
-# default on Linux, on Windows it defaults to
-# "C:\\Program Files\\Common Files"
+# We explicitly set datadir to a sensible value, as Cabal (used to?) use
+#     "C:\\Program Files\\Common Files"
+# on Windows
hunk ./libraries/Makefile 194
-# non-Windows the path we deduce is highre up than the path passed to
+# non-Windows the path we deduce is higher up than the path passed to
hunk ./libraries/Makefile 198
-DATA_REL_DIR = .
-datadir      = $$prefix
-libsubdir    = $$pkgid
+datadir        = $$prefix
+libsubdir      = $$pkgid
hunk ./libraries/Makefile 201
-DATA_REL_DIR = share/ghc
-datadir      = $$prefix/share/ghc
-libsubdir    = $$compiler/lib/$$pkgid
+datadir        = $$prefix/share/ghc
+libsubdir      = $$compiler/lib/$$pkgid
hunk ./libraries/Makefile 204
-DOC_ROOT     = $(prefix)/$(DATA_REL_DIR)/doc/html/
+libraryhtmldir = $(htmldir)/libraries
hunk ./libraries/Makefile 220
-	           --datasubdir='.' \
+	           --datasubdir='$$pkgid' \
hunk ./libraries/Makefile 222
+	           --docdir='$(libraryhtmldir)' \
hunk ./libraries/Makefile 268
-DOC_SUBDIRS = $(filter-out haskell98,$(SUBDIRS))
-
hunk ./libraries/Makefile 303
-	$(INSTALL_DIR)                              $(DOC_ROOT)
-	$(INSTALL_DATA)   index.html doc-index.html $(DOC_ROOT)
-	$(INSTALL_SCRIPT) gen_contents_index        $(DOC_ROOT)
+	$(INSTALL_DIR)                                      $(libraryhtmldir)/html
+	$(INSTALL_DATA)   index.html doc-index.html         $(libraryhtmldir)/html
+	$(INSTALL_SCRIPT) gen_contents_index                $(libraryhtmldir)/html
hunk ./libraries/Makefile 307
-	$(INSTALL_DATA)   $(DOC_ROOT)/base/*.css    $(DOC_ROOT)
-	$(INSTALL_DATA)   $(DOC_ROOT)/base/*.js     $(DOC_ROOT)
-	$(INSTALL_DATA)   $(DOC_ROOT)/base/*.gif    $(DOC_ROOT)
+	$(INSTALL_DATA)   $(libraryhtmldir)/html/base/*.css $(libraryhtmldir)/html
+	$(INSTALL_DATA)   $(libraryhtmldir)/html/base/*.js  $(libraryhtmldir)/html
+	$(INSTALL_DATA)   $(libraryhtmldir)/html/base/*.gif $(libraryhtmldir)/html
hunk ./mk/config.mk.in 507
+# This gets used in the default docdir
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+
hunk ./mk/config.mk.in 553
+docdir    = @docdir@
+htmldir   = @htmldir@
+dvidir    = @dvidir@
+pdfdir    = @pdfdir@
+psdir     = @psdir@
hunk ./mk/install.mk 281
-# TODO: The following could be an entry for an Obfuscated Makefile Contest...
hunk ./mk/install.mk 283
+# TODO: The following could be an entry for an Obfuscated Makefile Contest...
hunk ./mk/install.mk 285
-	$(INSTALL_DIR) $(DESTDIR)$(datadir)
-	for i in $(XMLDocWays); do \
-		if [ $$i = "html" ]; then \
-			$(INSTALL_DIR) $(DESTDIR)$(datadir)/html; \
-			$(INSTALL_DIR) $(DESTDIR)$(datadir)/html/$(INSTALL_XML_DOC); \
-			echo "( cd $(INSTALL_XML_DOC) && $(CP) * $(DESTDIR)$(datadir)/html/$(INSTALL_XML_DOC) )" ; \
-			( cd $(INSTALL_XML_DOC) && $(CP) * $(DESTDIR)$(datadir)/html/$(INSTALL_XML_DOC) ) ; \
-		else \
-			$(INSTALL_DIR) $(DESTDIR)$(datadir)/doc; \
-			echo $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC)`echo .$$i | sed s/\.html-no-chunks/.html/` $(DESTDIR)$(datadir)/doc; \
-			$(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC)`echo .$$i | sed s/\.html-no-chunks/.html/` $(DESTDIR)$(datadir)/doc; \
-		fi; \
-		if [ $$i = "html-no-chunks" ]; then \
-			echo $(CP) $(FPTOOLS_CSS_ABS) $(DESTDIR)$(datadir)/doc; \
-			$(CP) $(FPTOOLS_CSS_ABS) $(DESTDIR)$(datadir)/doc; \
-		fi \
-	done
+
+install-docs:: $(foreach i,$(XMLDocWays),install-docs-$i)
+
+install-docs-html:
+	$(INSTALL_DIR) $(DESTDIR)$(htmldir)
+	$(INSTALL_DIR) $(DESTDIR)$(htmldir)/$(INSTALL_XML_DOC)
+	$(INSTALL_DIR) $(DESTDIR)$(htmldir)/$(INSTALL_XML_DOC)/html
+	$(CP) $(INSTALL_XML_DOC)/* $(DESTDIR)$(htmldir)/$(INSTALL_XML_DOC)/html
+
+install-docs-html-no-chunks:
+	$(INSTALL_DIR) $(DESTDIR)$(htmldir)
+	$(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC).html $(DESTDIR)$(htmldir)
+	$(CP) $(FPTOOLS_CSS_ABS) $(DESTDIR)$(htmldir)
+
+install-docs-%:
+	$(INSTALL_DIR) $(DESTDIR)$($*dir)
+	$(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC)$* $(DESTDIR)$($*dir)
hunk ./mk/package.mk 306
-HTML_INSTALL_DIR = $(datadir)/html/libraries/$(PACKAGE)
+HTML_INSTALL_DIR = $(htmldir)/libraries/html/$(PACKAGE)
}