pass -no-user-package-conf to ghc-inplace

[ghc-hetmet.git] / mk / install.mk

diff --git a/mk/install.mk b/mk/install.mk
index 9ad3d2f..dd8dfc4 100644 (file)
--- a/mk/install.mk
+++ b/mk/install.mk
@@ -266,6 +266,14 @@ endif
 endif
 
 ifneq "$(strip $(INSTALL_XML_DOC))" ""
+ifeq "$(DOC_SUBDIR)" ""
+DOC_SUBDIR=docs/$(XML_DOC)
+endif
+
+binary-dist::
+       $(MKDIRHIER) $(BIN_DIST_DIR)/$(DOC_SUBDIR)
+       $(CP) Makefile $(BIN_DIST_DIR)/$(DOC_SUBDIR)
+
 ifneq "$(XMLDocWays)" ""
 # TODO: The following could be an entry for an Obfuscated Makefile Contest...
 install-docs:: $(foreach i,$(XMLDocWays),$(INSTALL_XML_DOC)$(patsubst %.html-no-chunks,%.html,$(patsubst %.html,%/index.html,.$(i))))
@@ -275,8 +283,7 @@ install-docs:: $(foreach i,$(XMLDocWays),install-docs-$i)
 install-docs-html:
        $(INSTALL_DIR) $(DESTDIR)$(htmldir)
        $(INSTALL_DIR) $(DESTDIR)$(htmldir)/$(INSTALL_XML_DOC)
-       $(INSTALL_DIR) $(DESTDIR)$(htmldir)/$(INSTALL_XML_DOC)/html
-       $(CP) $(INSTALL_XML_DOC)/* $(DESTDIR)$(htmldir)/$(INSTALL_XML_DOC)/html
+       $(CP) $(INSTALL_XML_DOC)/* $(DESTDIR)$(htmldir)/$(INSTALL_XML_DOC)
 
 install-docs-html-no-chunks:
        $(INSTALL_DIR) $(DESTDIR)$(htmldir)
@@ -285,7 +292,20 @@ install-docs-html-no-chunks:
 
 install-docs-%:
        $(INSTALL_DIR) $(DESTDIR)$($*dir)
-       $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC)$* $(DESTDIR)$($*dir)
+       $(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC).$* $(DESTDIR)$($*dir)
+
+binary-dist:: $(foreach i,$(XMLDocWays),$(INSTALL_XML_DOC)$(patsubst %.html-no-chunks,%.html,$(patsubst %.html,%/index.html,.$(i))))
+
+binary-dist:: $(foreach i,$(XMLDocWays),binary-dist-docs-$i)
+
+binary-dist-docs-html:
+       $(CP) -r $(INSTALL_XML_DOC) $(BIN_DIST_DIR)/$(DOC_SUBDIR)
+
+binary-dist-docs-html-no-chunks:
+       $(CP) $(INSTALL_XML_DOC).html $(BIN_DIST_DIR)/$(DOC_SUBDIR)/
+
+binary-dist-docs-%:
+       $(CP) $(INSTALL_XML_DOC).$* $(BIN_DIST_DIR)/$(DOC_SUBDIR)/
 endif
 endif