From 47493e60fa2f8f520297969472dde01931530707 Mon Sep 17 00:00:00 2001 From: Thomas Miedema Date: Sat, 15 Aug 2015 14:18:07 +0200 Subject: 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. --- driver/ghci/ghc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'driver') diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk index ba6984c37a..240e16ff71 100644 --- a/driver/ghci/ghc.mk +++ b/driver/ghci/ghc.mk @@ -18,7 +18,7 @@ install: install_driver_ghci .PHONY: install_driver_ghci install_driver_ghci: WRAPPER=$(DESTDIR)$(bindir)/ghci-$(ProjectVersion) install_driver_ghci: - $(call INSTALL_DIR,"$(DESTDIR)$(bindir)") + $(INSTALL_DIR) "$(DESTDIR)$(bindir)" $(call removeFiles, "$(WRAPPER)") $(CREATE_SCRIPT) "$(WRAPPER)" echo '#!$(SHELL)' >> "$(WRAPPER)" @@ -54,7 +54,7 @@ install : install_driver_ghcii install_driver_ghcii: GHCII_SCRIPT=$(DESTDIR)$(bindir)/ghcii.sh install_driver_ghcii: GHCII_SCRIPT_VERSIONED = $(DESTDIR)$(bindir)/ghcii-$(ProjectVersion).sh install_driver_ghcii: - $(call INSTALL_DIR,$(DESTDIR)$(bindir)) + $(INSTALL_DIR) "$(DESTDIR)$(bindir)" $(call removeFiles,"$(GHCII_SCRIPT)") echo "#!$(SHELL)" >> $(GHCII_SCRIPT) echo 'exec "$$(dirname "$$0")"/ghc --interactive "$$@"' >> $(GHCII_SCRIPT) -- cgit v1.2.1