X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Finstall.mk;h=dd8dfc4946197b94dbc173690a922d0a1a26333f;hp=d2e8d030a484df9e57f18fc377efa53ee948e08b;hb=d70b588ca35138bcfa21f30eb27b2015cb954ed0;hpb=d59e5356ca49548f9a3e51e03742adec72356a94 diff --git a/mk/install.mk b/mk/install.mk index d2e8d03..dd8dfc4 100644 --- a/mk/install.mk +++ b/mk/install.mk @@ -266,9 +266,13 @@ endif endif ifneq "$(strip $(INSTALL_XML_DOC))" "" +ifeq "$(DOC_SUBDIR)" "" +DOC_SUBDIR=docs/$(XML_DOC) +endif + binary-dist:: - $(MKDIRHIER) $(BIN_DIST_DIR)/docs/$(XML_DOC) - $(CP) Makefile $(BIN_DIST_DIR)/docs/$(XML_DOC) + $(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... @@ -295,13 +299,13 @@ binary-dist:: $(foreach i,$(XMLDocWays),$(INSTALL_XML_DOC)$(patsubst %.html-no-c binary-dist:: $(foreach i,$(XMLDocWays),binary-dist-docs-$i) binary-dist-docs-html: - $(CP) -r $(INSTALL_XML_DOC) $(BIN_DIST_DIR)/docs/$(XML_DOC)/ + $(CP) -r $(INSTALL_XML_DOC) $(BIN_DIST_DIR)/$(DOC_SUBDIR) binary-dist-docs-html-no-chunks: - $(CP) $(INSTALL_XML_DOC).html $(BIN_DIST_DIR)/docs/$(XML_DOC)/ + $(CP) $(INSTALL_XML_DOC).html $(BIN_DIST_DIR)/$(DOC_SUBDIR)/ binary-dist-docs-%: - $(CP) $(INSTALL_XML_DOC).$* $(BIN_DIST_DIR)/docs/$(XML_DOC)/ + $(CP) $(INSTALL_XML_DOC).$* $(BIN_DIST_DIR)/$(DOC_SUBDIR)/ endif endif