X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=82eb531f2eb9ea1840781f89eb3ff315c1fecf60;hb=4a5569ff37ae771560e56b564f3b15477b828a79;hp=287db6d4d9848d5aa4d045d260ee32f508cf59f3;hpb=2fda738875042f7d2339f18b6c8b43ef7901bc94;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 287db6d..82eb531 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -13,8 +13,6 @@
 # ToDo List.
 #
 #   * finish installation
-#     * other documentation
-#     * create doc index and contents
 #     * Windows: should we have ghc-pkg-<version>?
 #     * should we be stripping things?
 #     * install libgmp.a, gmp.h
@@ -591,6 +589,11 @@ libraries/base3-compat_dist-install_HC_OPTS += -XPackageImports
 .PHONY: stage1_libs
 stage1_libs : $(ALL_STAGE1_LIBS)
 
+libraries/index.html: $(ALL_HADDOCK_FILES)
+	cd libraries && sh gen_contents_index --inplace
+$(eval $(call all-target,library_doc_index,libraries/index.html))
+INSTALL_LIBRARY_DOCS += libraries/*.html libraries/*.gif libraries/*.css libraries/*.js
+
 # -----------------------------------------------------------------------------
 # Bootstrapping libraries
 
@@ -710,13 +713,13 @@ install_libs: $(INSTALL_LIBS)
 	done
 
 install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS)
-	"$(MKDIRHIER)" $(DESTDIR)$(libexecdir)
+	$(INSTALL_DIR) $(DESTDIR)$(libexecdir)
 	for i in $(INSTALL_LIBEXEC_SCRIPTS); do \
 		$(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(libexecdir); \
 	done
 
 install_libexecs:  $(INSTALL_LIBEXECS)
-	"$(MKDIRHIER)" $(DESTDIR)$(libexecdir)
+	$(INSTALL_DIR) $(DESTDIR)$(libexecdir)
 	for i in $(INSTALL_LIBEXECS); do \
 		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(libexecdir); \
 	done
@@ -733,6 +736,9 @@ install_docs: $(INSTALL_HEADERS)
 		$(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir); \
 	done
 	$(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html; \
+	for i in $(INSTALL_LIBRARY_DOCS); do \
+		$(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir)/libraries/; \
+	done
 	for i in $(INSTALL_HTML_DOC_DIRS); do \
 		$(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html/`basename $$i`; \
 		$(INSTALL_DOC) $(INSTALL_OPTS) $$i/* $(DESTDIR)$(docdir)/html/`basename $$i`; \
@@ -750,8 +756,10 @@ endif
 
 install_packages: install_libexecs
 install_packages: libffi/package.conf.install rts/package.conf.install
-	"$(MKDIRHIER)" $(DESTDIR)$(libdir)
-	echo "[]" > $(INSTALLED_PACKAGE_CONF)
+	$(INSTALL_DIR) $(DESTDIR)$(libdir)
+	"$(RM)" $(RM_OPTS) $(INSTALLED_PACKAGE_CONF)
+	$(CREATE_DATA)     $(INSTALLED_PACKAGE_CONF)
+	echo "[]"       >> $(INSTALLED_PACKAGE_CONF)
 	"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update libffi/package.conf.install
 	"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update rts/package.conf.install
 	$(foreach p, $(PACKAGES) $(PACKAGES_STAGE2),\
@@ -786,19 +794,31 @@ $(eval $(call bindist,.,\
     $(INSTALL_LIBEXECS) \
     $(INSTALL_LIBEXEC_SCRIPTS) \
     $(INSTALL_BINS) \
+    $(INSTALL_DOCS) \
+    $(INSTALL_LIBRARY_DOCS) \
+    $(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \
+	$(wildcard libraries/*/dist-install/doc/) \
     $(filter-out extra-gcc-opts,$(INSTALL_LIBS)) \
     $(filter-out %/project.mk,$(filter-out mk/config.mk,$(MAKEFILE_LIST))) \
 	mk/fix_install_names.sh \
 	mk/project.mk \
+	bindist.mk \
 	libraries/dph/LICENSE \
  ))
 # mk/project.mk gets an absolute path, so we manually include it in
 # the bindist with a relative path
 
+BIN_DIST_MK = $(BIN_DIST_NAME)/bindist.mk
+
 binary-dist:
 	"$(RM)" $(RM_OPTS) -r $(BIN_DIST_NAME)
 	mkdir $(BIN_DIST_NAME)
 	set -e; for i in LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace; do ln -s ../$$i $(BIN_DIST_NAME)/; done
+	echo "HADDOCK_DOCS       = $(HADDOCK_DOCS)"       >> $(BIN_DIST_MK)
+	echo "LATEX_DOCS         = $(LATEX_DOCS)"         >> $(BIN_DIST_MK)
+	echo "BUILD_DOCBOOK_HTML = $(BUILD_DOCBOOK_HTML)" >> $(BIN_DIST_MK)
+	echo "BUILD_DOCBOOK_PS   = $(BUILD_DOCBOOK_PS)"   >> $(BIN_DIST_MK)
+	echo "BUILD_DOCBOOK_PDF  = $(BUILD_DOCBOOK_PDF)"  >> $(BIN_DIST_MK)
 	ln -s ../distrib/configure-bin.ac $(BIN_DIST_NAME)/configure.ac
 	cd $(BIN_DIST_NAME) && autoreconf
 	"$(RM)" $(RM_OPTS) $(BIN_DIST_TAR)
@@ -823,6 +843,10 @@ ifeq "$(mingw32_TARGET_OS)" "1"
 	$(call nTimes,10,$(PublishCp) $(WINDOWS_INSTALLER) $(PublishLocation)/dist)
 endif
 
+.PHONY: publish-docs
+publish-docs:
+	$(call nTimes,10,$(PublishCp) -r bindisttest/installed/share/doc/ghc/* $(PublishLocation)/docs)
+
 # -----------------------------------------------------------------------------
 # Source distributions