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

diff --git a/mk/install.mk b/mk/install.mk
index a55b89d..1efb695 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)" ""
@@ -158,7 +145,12 @@ ifneq "$(strip $(INSTALL_PROGS))" ""
 # entry in the INSTALL_PROGS list. If there's no suffix, use
 # $(exeext).
 # 
-INSTALL_PROGS := $(foreach p, $(INSTALL_PROGS), $(addsuffix $(if $(suffix $(p)),,$(exeext)), $(basename $(p))))
+INSTALL_PROGS := $(foreach p, $(INSTALL_PROGS),\
+                   $(if $(filter $(exeext),$(suffix $p)),\
+                        $p,\
+                        $(addsuffix $(exeext),$p)\
+                    )\
+                  )
 
 install:: $(INSTALL_PROGS)
 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
@@ -279,6 +271,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 +284,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 +293,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