summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2015-08-15 14:18:07 +0200
committerThomas Miedema <thomasmiedema@gmail.com>2015-08-21 19:20:51 +0200
commit47493e60fa2f8f520297969472dde01931530707 (patch)
tree75695993b4d953131a1f580fa4cb362e4f1ab70a /rules
parent2f29ebbb6f8c914f2bba624f3edcc259274df8af (diff)
downloadhaskell-47493e60fa2f8f520297969472dde01931530707.tar.gz
Build system: simplify install.mk.in
This will allow fixing #1851 more easily ("make install-strip" should work). This reverts 57e2a81c589103b50da80a9e378b1a11285bd521: "On Cygwin, use a Cygwin-style path for /bin/install's destination" Update submodule haddock and hsc2hs.
Diffstat (limited to 'rules')
-rw-r--r--rules/shell-wrapper.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk
index f5d91e35b7..11eef67a83 100644
--- a/rules/shell-wrapper.mk
+++ b/rules/shell-wrapper.mk
@@ -77,7 +77,7 @@ install: install_$1_$2_wrapper
.PHONY: install_$1_$2_wrapper
install_$1_$2_wrapper: WRAPPER=$$(DESTDIR)$$(bindir)/$(CrossCompilePrefix)$$($1_$2_INSTALL_SHELL_WRAPPER_NAME)
install_$1_$2_wrapper:
- $$(call INSTALL_DIR,"$$(DESTDIR)$$(bindir)")
+ $$(INSTALL_DIR) "$$(DESTDIR)$$(bindir)"
$$(call removeFiles, "$$(WRAPPER)")
$$(CREATE_SCRIPT) "$$(WRAPPER)"
echo '#!$$(SHELL)' >> "$$(WRAPPER)"