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

diff --git a/mk/install.mk b/mk/install.mk
index 9ad3d2f..41b312c 100644
--- a/mk/install.mk
+++ b/mk/install.mk
@@ -266,6 +266,10 @@ endif
 endif
 
 ifneq "$(strip $(INSTALL_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...
 install-docs:: $(foreach i,$(XMLDocWays),$(INSTALL_XML_DOC)$(patsubst %.html-no-chunks,%.html,$(patsubst %.html,%/index.html,.$(i))))
@@ -275,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)
@@ -285,7 +288,7 @@ 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)
 endif
 endif