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

diff --git a/mk/install.mk b/mk/install.mk
index a55b89d..41b312c 100644
--- a/mk/install.mk
+++ b/mk/install.mk
@@ -111,7 +111,7 @@ endif # LINK
 # friends can be overridden from their original settings in mk/config.mk.in
 # || mk/build.mk
 #
-.PHONY: install install-docs installdirs install-strip install-dirs install-docs show-install
+.PHONY: install install-docs installdirs install-strip install-docs show-install
 
 show-install :
 	@echo "DESTDIR = $(DESTDIR)"
@@ -124,19 +124,6 @@ show-install :
 	@echo "includedir = $(includedir)"
 
 #
-# Sometimes useful to separate out the creation of install directories 
-# from the installation itself.
-#
-install-dirs ::
-	$(INSTALL_DIR) $(DESTDIR)$(bindir)
-	$(INSTALL_DIR) $(DESTDIR)$(libdir)
-	$(INSTALL_DIR) $(DESTDIR)$(libexecdir)
-	$(INSTALL_DIR) $(DESTDIR)$(datadir)
-
-# Better do this first...
-install:: install-dirs
-
-#
 # Setting user/group ownership for the installed entities
 #
 ifneq "$(INSTALL_OWNER)" ""
@@ -279,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))))
@@ -288,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)
@@ -298,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