X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Finstall.mk;h=1efb6958ef19e9d929d6f9197c131409679412c2;hb=4da93ad236882128b7b446e83a2c159ef17d7ffa;hp=dd8dfc4946197b94dbc173690a922d0a1a26333f;hpb=f9c199a1a2865bdb9e8fb318a48058d7e4bfaf64;p=ghc-hetmet.git

diff --git a/mk/install.mk b/mk/install.mk
index dd8dfc4..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)
@@ -270,10 +275,6 @@ ifeq "$(DOC_SUBDIR)" ""
 DOC_SUBDIR=docs/$(XML_DOC)
 endif
 
-binary-dist::
-	$(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...
 install-docs:: $(foreach i,$(XMLDocWays),$(INSTALL_XML_DOC)$(patsubst %.html-no-chunks,%.html,$(patsubst %.html,%/index.html,.$(i))))
@@ -293,19 +294,6 @@ install-docs-html-no-chunks:
 install-docs-%:
 	$(INSTALL_DIR) $(DESTDIR)$($*dir)
 	$(INSTALL_DATA) $(INSTALL_OPTS) $(INSTALL_XML_DOC).$* $(DESTDIR)$($*dir)
-
-binary-dist:: $(foreach i,$(XMLDocWays),$(INSTALL_XML_DOC)$(patsubst %.html-no-chunks,%.html,$(patsubst %.html,%/index.html,.$(i))))
-
-binary-dist:: $(foreach i,$(XMLDocWays),binary-dist-docs-$i)
-
-binary-dist-docs-html:
-	$(CP) -r $(INSTALL_XML_DOC) $(BIN_DIST_DIR)/$(DOC_SUBDIR)
-
-binary-dist-docs-html-no-chunks:
-	$(CP) $(INSTALL_XML_DOC).html $(BIN_DIST_DIR)/$(DOC_SUBDIR)/
-
-binary-dist-docs-%:
-	$(CP) $(INSTALL_XML_DOC).$* $(BIN_DIST_DIR)/$(DOC_SUBDIR)/
 endif
 endif