X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=e67466a1eca674080b4c67b1c80b5272448095ed;hp=508981350d6145085edb9a506fabc1420c48fb57;hb=bd2a36fc0a209c119e9451376b18e3c9b199d4f5;hpb=08802abf829a0dd1af091e2b61e5c8aa03e57423

diff --git a/libraries/Makefile b/libraries/Makefile
index 5089813..e67466a 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -91,7 +91,21 @@ space=$(empty) $(empty)
 
 # -----------------------------------------------------------------------------
 
-libraryhtmldir = $(htmldir)/libraries
+docdir := $(docdir)/libraries/$$pkgid
+ifeq "$(Windows)" "YES"
+# On Windows we want to make moveable bindists, but we need to tell
+# ghc-pkg where the haddock docs are. Therefore we completely ignore
+# where the user tells us to put the haddock documentation and put it
+# somewhere whose relative location we know. When installing we need
+# to give Cabal a real path, though.
+htmldir_configure = $$topdir/doc/libraries/$$pkgid
+htmldir_install   = $(prefix)/doc/libraries/$$pkgid
+else
+# On non-Windows we can just give absolute paths all the time, and
+# thus obey the htmldir that we are given.
+htmldir_configure = $(htmldir)/libraries/$$pkgid
+htmldir_install   = $(htmldir_configure)
+endif
 
 ifneq "$(DOING_BIN_DIST)" "YES"
 
@@ -218,10 +232,10 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 	( cd $* && setup/Setup configure \
 	           $(CONFIGURE_OPTS) \
 	           --prefix='$$topdir' \
+			   --docdir='$(docdir)' \
+			   --htmldir='$(htmldir_configure)' \
 	           --datadir='$(datadir)' \
-	           --datasubdir='$$pkgid' \
 	           --libsubdir='$(libsubdir)' \
-	           --docdir='$(libraryhtmldir)' \
 	           --with-compiler=../../compiler/stage1/ghc-inplace$ \
 	           --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \
 	           --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \
@@ -286,7 +300,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
 	$(RM) -rf bootstrapping.*
 	$(RM) -rf ifBuildable
 	$(RM) -rf installPackage
-	$(RM) -f libraries.txt index.html doc-index.html doc-index-*.html
+	$(RM) -f libraries.txt index.html doc-index.html doc-index*.html
 
 $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
 clean.library.%:
@@ -300,17 +314,15 @@ endif
 
 .PHONY: install install-docs install.library.%
 
-DESTlibraryhtmldir = $(DESTDIR)$(libraryhtmldir)/html
-
 install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR))
 ifeq "$(HADDOCK_DOCS)" "YES"
-	$(INSTALL_DIR)                                      $(DESTlibraryhtmldir)
-	$(INSTALL_DATA)   index.html doc-index.html         $(DESTlibraryhtmldir)
-	$(INSTALL_SCRIPT) gen_contents_index                $(DESTlibraryhtmldir)
+	$(INSTALL_DIR)                                              $(DESTDIR)$(htmldir_install)
+	$(INSTALL_DATA)   index.html doc-index*.html                $(DESTDIR)$(htmldir_install)
+	$(INSTALL_SCRIPT) gen_contents_index                        $(DESTDIR)$(htmldir_install)
 	# Hacks:
-	$(INSTALL_DATA)   $(DESTlibraryhtmldir)/base/*.css $(DESTlibraryhtmldir)
-	$(INSTALL_DATA)   $(DESTlibraryhtmldir)/base/*.js  $(DESTlibraryhtmldir)
-	$(INSTALL_DATA)   $(DESTlibraryhtmldir)/base/*.gif $(DESTlibraryhtmldir)
+	$(INSTALL_DATA)   $(DESTDIR)$(htmldir_install)/base-*/*.css $(DESTDIR)$(htmldir_install)
+	$(INSTALL_DATA)   $(DESTDIR)$(htmldir_install)/base-*/*.js  $(DESTDIR)$(htmldir_install)
+	$(INSTALL_DATA)   $(DESTDIR)$(htmldir_install)/base-*/*.gif $(DESTDIR)$(htmldir_install)
 endif
 
 # Cabal doesn't let us ask to install docs only, so do nothing here
@@ -320,11 +332,15 @@ install-docs:
 # Ideally this would depend on a stamp/build.library.%, but if it does
 # then we can't change the libraries and then just rerun make.
 # Thus if you install without building then it will just break.
+
+# prefix and (on Windows) htmldir use $topdir when configuring, so we
+# need to tell installPackage the real path to use when installing.
+
 $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: installPackage/installPackage ifBuildable/ifBuildable
 	if ifBuildable/ifBuildable $*; then \
 	  cd $* && \
-	  ../installPackage/installPackage "$(DESTDIR)" "$(prefix)" "$(datadir)" "$(libraryhtmldir)" "$(GHC_PKG_PROG)" "$(DESTDIR)$(libdir)/package.conf" ; \
+	  ../installPackage/installPackage '$(DESTDIR)' '$(prefix)' '$(htmldir_install)' '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' ; \
 	fi
 
 .PHONY: binary-dist binary-dist.library.%
@@ -340,7 +356,7 @@ binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR))
 ifeq "$(HADDOCK_DOCS)" "YES"
 	cp    gen_contents_index            $(BIN_DIST_LIBDIR)
 	cp    index.html                    $(BIN_DIST_LIBDIR)
-	cp    doc-index.html                $(BIN_DIST_LIBDIR)
+	cp    doc-index*.html               $(BIN_DIST_LIBDIR)
 endif
 	cp -pR stamp                         $(BIN_DIST_LIBDIR)