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

diff --git a/mk/install.mk b/mk/install.mk
index 9ad3d2f..1efb695 100644
--- a/mk/install.mk
+++ b/mk/install.mk
@@ -145,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)
@@ -266,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))))
@@ -275,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)
@@ -285,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