summaryrefslogtreecommitdiff
path: root/driver/ghci
diff options
context:
space:
mode:
authorAustin Seipp <austin@well-typed.com>2014-07-28 07:53:32 -0500
committerAustin Seipp <austin@well-typed.com>2014-07-28 09:29:18 -0500
commit8240312ae37a4a1cb89adf13289ac48d7e2aa1d8 (patch)
treeafd7033d7554a288e61bf9566e45e76d877ea695 /driver/ghci
parent003bcf20c20391fdd61789ba24269b0f508a3d2f (diff)
downloadhaskell-8240312ae37a4a1cb89adf13289ac48d7e2aa1d8.tar.gz
driver: Fix usage of '$0' in ghcii.sh (#8873)
Signed-off-by: Austin Seipp <austin@well-typed.com>
Diffstat (limited to 'driver/ghci')
-rw-r--r--driver/ghci/ghc.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk
index 4c5c09e761..ba6984c37a 100644
--- a/driver/ghci/ghc.mk
+++ b/driver/ghci/ghc.mk
@@ -22,7 +22,7 @@ install_driver_ghci:
$(call removeFiles, "$(WRAPPER)")
$(CREATE_SCRIPT) "$(WRAPPER)"
echo '#!$(SHELL)' >> "$(WRAPPER)"
- echo 'exec "$(bindir)/ghc-$(ProjectVersion)" --interactive $${1+"$$@"}' >> "$(WRAPPER)"
+ echo 'exec "$(bindir)/ghc-$(ProjectVersion)" --interactive "$$@"' >> "$(WRAPPER)"
$(EXECUTABLE_FILE) "$(WRAPPER)"
$(call removeFiles,"$(DESTDIR)$(bindir)/ghci")
$(LN_S) ghci-$(ProjectVersion) "$(DESTDIR)$(bindir)/ghci"
@@ -57,7 +57,7 @@ install_driver_ghcii:
$(call INSTALL_DIR,$(DESTDIR)$(bindir))
$(call removeFiles,"$(GHCII_SCRIPT)")
echo "#!$(SHELL)" >> $(GHCII_SCRIPT)
- echo 'exec "$$0"/../ghc --interactive $${1+"$$@"}' >> $(GHCII_SCRIPT)
+ echo 'exec "$$(dirname "$$0")"/ghc --interactive "$$@"' >> $(GHCII_SCRIPT)
$(EXECUTABLE_FILE) $(GHCII_SCRIPT)
cp $(GHCII_SCRIPT) $(GHCII_SCRIPT_VERSIONED)
$(EXECUTABLE_FILE) $(GHCII_SCRIPT_VERSIONED)