summaryrefslogtreecommitdiff
path: root/includes
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 /includes
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 'includes')
-rw-r--r--includes/ghc.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/includes/ghc.mk b/includes/ghc.mk
index 7a255db601..06f4912cf4 100644
--- a/includes/ghc.mk
+++ b/includes/ghc.mk
@@ -226,10 +226,10 @@ install: install_includes
.PHONY: install_includes
install_includes :
- $(call INSTALL_DIR,"$(DESTDIR)$(ghcheaderdir)")
+ $(INSTALL_DIR) "$(DESTDIR)$(ghcheaderdir)"
$(foreach d,$(includes_H_SUBDIRS), \
- $(call INSTALL_DIR,"$(DESTDIR)$(ghcheaderdir)/$d") && \
- $(call INSTALL_HEADER,$(INSTALL_OPTS),includes/$d/*.h,"$(DESTDIR)$(ghcheaderdir)/$d/") && \
+ $(INSTALL_DIR) "$(DESTDIR)$(ghcheaderdir)/$d" && \
+ $(INSTALL_HEADER) $(INSTALL_OPTS) includes/$d/*.h "$(DESTDIR)$(ghcheaderdir)/$d/" && \
) true
- $(call INSTALL_HEADER,$(INSTALL_OPTS),$(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_H_VERSION) $(includes_DERIVEDCONSTANTS),"$(DESTDIR)$(ghcheaderdir)/")
+ $(INSTALL_HEADER) $(INSTALL_OPTS) $(includes_H_CONFIG) $(includes_H_PLATFORM) $(includes_H_VERSION) $(includes_DERIVEDCONSTANTS) "$(DESTDIR)$(ghcheaderdir)/"