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 e73a82f..dd8dfc4 100644 (file)
--- 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