From 8240312ae37a4a1cb89adf13289ac48d7e2aa1d8 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 28 Jul 2014 07:53:32 -0500 Subject: driver: Fix usage of '$0' in ghcii.sh (#8873) Signed-off-by: Austin Seipp --- 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 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) -- cgit v1.2.1