X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=d2e2b06ee64e2d121237a15e7e90e380b03f16bf;hb=1f86a2618408913b267c767be5080175ce48d5de;hp=1e76edee57fbc9fae4ffdaac74904ac8342c435e;hpb=88aa9117c3bd185e96a0bdc2e935afe180c6decc;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 1e76ede..d2e2b06 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -88,6 +88,8 @@ space=$(empty) $(empty)
 
 # -----------------------------------------------------------------------------
 
+libraryhtmldir = $(htmldir)/libraries
+
 ifneq "$(DOING_BIN_DIST)" "YES"
 
 CONFIGURE_OPTS =
@@ -195,13 +197,10 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \
 # the executable with the shell script on non-Windows. This should
 # probably be tidied up so that we can always pass the same libsubdir.
 ifeq "$(Windows)" "YES"
-datadir        = $$prefix
 libsubdir      = $$pkgid
 else
-datadir        = $$prefix/share/ghc
 libsubdir      = $$compiler/lib/$$pkgid
 endif
-libraryhtmldir = $(htmldir)/libraries
 
 # We rely on all the CONFIGURE_ARGS being quoted with '...', and there
 # being no 's inside the values.
@@ -272,7 +271,7 @@ $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                %/setup/Setup ifBuildable/ifBuildable
 	if ifBuildable/ifBuildable $*; then \
-	  cd $* && setup/Setup haddock; \
+	  cd $* && setup/Setup haddock --html-location='../$$pkg'; \
 	fi
 
 .PHONY: distclean clean clean.library.%
@@ -298,15 +297,17 @@ endif
 
 .PHONY: install install-docs install.library.%
 
+DESTlibraryhtmldir = $(DESTDIR)$(libraryhtmldir)/html
+
 install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR))
 ifeq "$(HADDOCK_DOCS)" "YES"
-	$(INSTALL_DIR)                                      $(libraryhtmldir)/html
-	$(INSTALL_DATA)   index.html doc-index.html         $(libraryhtmldir)/html
-	$(INSTALL_SCRIPT) gen_contents_index                $(libraryhtmldir)/html
+	$(INSTALL_DIR)                                      $(DESTlibraryhtmldir)
+	$(INSTALL_DATA)   index.html doc-index.html         $(DESTlibraryhtmldir)
+	$(INSTALL_SCRIPT) gen_contents_index                $(DESTlibraryhtmldir)
 	# Hacks:
-	$(INSTALL_DATA)   $(libraryhtmldir)/html/base/*.css $(libraryhtmldir)/html
-	$(INSTALL_DATA)   $(libraryhtmldir)/html/base/*.js  $(libraryhtmldir)/html
-	$(INSTALL_DATA)   $(libraryhtmldir)/html/base/*.gif $(libraryhtmldir)/html
+	$(INSTALL_DATA)   $(DESTlibraryhtmldir)/base/*.css $(DESTlibraryhtmldir)
+	$(INSTALL_DATA)   $(DESTlibraryhtmldir)/base/*.js  $(DESTlibraryhtmldir)
+	$(INSTALL_DATA)   $(DESTlibraryhtmldir)/base/*.gif $(DESTlibraryhtmldir)
 endif
 
 # Cabal doesn't let us ask to install docs only, so do nothing here
@@ -320,7 +321,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: installPackage/installPackage ifBuildable/ifBuildable
 	if ifBuildable/ifBuildable $*; then \
 	  cd $* && \
-	  ../installPackage/installPackage $(DESTDIR)$(prefix) $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)/ghc-pkg-inplace $(DESTDIR)$(libdir)/package.conf; \
+	  ../installPackage/installPackage "$(DESTDIR)" "$(prefix)" "$(datadir)" "$(libraryhtmldir)" "$(GHC_PKG_PROG)" "$(DESTDIR)$(libdir)/package.conf" ; \
 	fi
 
 .PHONY: binary-dist binary-dist.library.%
@@ -333,10 +334,12 @@ binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR))
 	mkdir                               $(BIN_DIST_LIBDIR)/ifBuildable
 	cp 	  ifBuildable/ifBuildable       $(BIN_DIST_LIBDIR)/ifBuildable
 	cp    Makefile                      $(BIN_DIST_LIBDIR)
+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 -a stamp                         $(BIN_DIST_LIBDIR)
+endif
+	cp -pR stamp                         $(BIN_DIST_LIBDIR)
 
 $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \
 binary-dist.library.%:
@@ -345,8 +348,8 @@ binary-dist.library.%:
 	  cd $* && \
 	  cp    $*.cabal      $(BIN_DIST_LIBDIR)/$* && \
 	  cp    LICENSE       $(BIN_DIST_LIBDIR)/$* && \
-	  cp -a dist          $(BIN_DIST_LIBDIR)/$* && \
-	  (cp -aL include      $(BIN_DIST_LIBDIR)/$* || :) && \
+	  cp -R dist          $(BIN_DIST_LIBDIR)/$* && \
+	  (cp -RL include      $(BIN_DIST_LIBDIR)/$* || true) && \
 	  $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
 	     \( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \
 	  $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \