projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Layout only
[ghc-hetmet.git]
/
mk
/
install.mk
diff --git
a/mk/install.mk
b/mk/install.mk
index
d594c8c
..
1efb695
100644
(file)
--- 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).
#
# 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)
install:: $(INSTALL_PROGS)
$(INSTALL_DIR) $(DESTDIR)$(bindir)
@@
-266,6
+271,10
@@
endif
endif
ifneq "$(strip $(INSTALL_XML_DOC))" ""
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))))
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-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)
install-docs-html-no-chunks:
$(INSTALL_DIR) $(DESTDIR)$(htmldir)