X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=5ba4d70604733da9b818bd88b222471ba0298ea7;hb=0fcdfcf6cc0cb7a894559ba1ba5c7fe2adc61862;hp=1b6546b758339429c41ef5d7c5a27fae2ebcab9a;hpb=93ff058d179e1c6f36d5df7fa290f326d79b680a;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 1b6546b..5ba4d70 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.
@@ -224,7 +223,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 	           --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \
 	           --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \
 	           --with-ld=$(LD) \
-	           --haddock-args="--use-contents=../index.html \
+	           --haddock-options="--use-contents=../index.html \
 	                           --use-index=../doc-index.html" \
 	           $(FLAGGED_CONFIGURE_ARGS) \
 	           --configure-option=--with-cc=$(CC) ) \
@@ -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.%
@@ -322,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.%
@@ -344,13 +343,13 @@ endif
 
 $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \
 binary-dist.library.%:
-	$(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*
 	if ifBuildable/ifBuildable $*; then \
+	  $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$* \
 	  cd $* && \
 	  cp    $*.cabal      $(BIN_DIST_LIBDIR)/$* && \
 	  cp    LICENSE       $(BIN_DIST_LIBDIR)/$* && \
 	  cp -R dist          $(BIN_DIST_LIBDIR)/$* && \
-	  (cp -RL include      $(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 \