summaryrefslogtreecommitdiff
path: root/utils
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 /utils
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 'utils')
-rw-r--r--utils/ghc-pkg/ghc.mk2
m---------utils/haddock0
m---------utils/hsc2hs0
3 files changed, 1 insertions, 1 deletions
diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
index 487109e7aa..1bd44c9f12 100644
--- a/utils/ghc-pkg/ghc.mk
+++ b/utils/ghc-pkg/ghc.mk
@@ -78,7 +78,7 @@ install: install_utils/ghc-pkg_link
.PHONY: install_utils/ghc-pkg_link
install_utils/ghc-pkg_link:
- $(call INSTALL_DIR,"$(DESTDIR)$(bindir)")
+ $(INSTALL_DIR) "$(DESTDIR)$(bindir)"
$(call removeFiles,"$(DESTDIR)$(bindir)/$(CrossCompilePrefix)ghc-pkg")
$(LN_S) $(CrossCompilePrefix)ghc-pkg-$(ProjectVersion) "$(DESTDIR)$(bindir)/$(CrossCompilePrefix)ghc-pkg"
endif
diff --git a/utils/haddock b/utils/haddock
-Subproject 62f3a12863121fa5b6c2787185e62cfa3f44bdd
+Subproject 6a1d4a65010932a660ceacda93c8c20fb5e1399
diff --git a/utils/hsc2hs b/utils/hsc2hs
-Subproject a281856375beaf9082010c445599446faad6beb
+Subproject 293f41c78e956b78363ede463e7ff52eb6bc997