X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Finstall.mk;h=41b312c3c56904aa4b21d317982708e4237db0a5;hb=f38871fdd92e466cbbc7eb08e226c4213bcbd7d6;hp=9f4a1e5e69d4dc831b8675b9b5a51dbde74c2db8;hpb=4217c6caef9f6d261df1449c590331878a493f14;p=ghc-hetmet.git

diff --git a/mk/install.mk b/mk/install.mk
index 9f4a1e5..41b312c 100644
--- a/mk/install.mk
+++ b/mk/install.mk
@@ -266,9 +266,9 @@ endif
 endif
 
 ifneq "$(strip $(INSTALL_XML_DOC))" ""
-binary-dist::
-	$(MKDIRHIER) $(BIN_DIST_DIR)/docs/$(XML_DOC)
-	cp Makefile $(BIN_DIST_DIR)/docs/$(XML_DOC)
+ifeq "$(DOC_SUBDIR)" ""
+DOC_SUBDIR=docs/$(XML_DOC)
+endif
 
 ifneq "$(XMLDocWays)" ""
 # TODO: The following could be an entry for an Obfuscated Makefile Contest...
@@ -279,8 +279,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)
@@ -290,19 +289,6 @@ install-docs-html-no-chunks:
 install-docs-%:
 	$(INSTALL_DIR) $(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)/docs/$(XML_DOC)/
-
-binary-dist-docs-html-no-chunks:
-	cp $(INSTALL_XML_DOC).html $(BIN_DIST_DIR)/docs/$(XML_DOC)/
-
-binary-dist-docs-%:
-	cp $(INSTALL_XML_DOC).$* $(BIN_DIST_DIR)/docs/$(XML_DOC)/
 endif
 endif