Fix permissions when installing

[ghc-hetmet.git] / ghc.mk

diff --git a/ghc.mk b/ghc.mk
index 7aa708c..82eb531 100644 (file)
--- 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),\
@@ -787,7 +795,9 @@ $(eval $(call bindist,.,\
     $(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 \
@@ -833,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