diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-08-15 14:18:07 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-08-21 19:20:51 +0200 |
| commit | 47493e60fa2f8f520297969472dde01931530707 (patch) | |
| tree | 75695993b4d953131a1f580fa4cb362e4f1ab70a /driver | |
| parent | 2f29ebbb6f8c914f2bba624f3edcc259274df8af (diff) | |
| download | haskell-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 'driver')
| -rw-r--r-- | driver/ghci/ghc.mk | 4 |
1 files changed, 2 insertions, 2 deletions
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) |