From e1826dcc04394bc35769573eea250ada2e1ad1a0 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Mon, 25 Aug 2008 18:32:47 +0000 Subject: [PATCH] Fix the ghci script; fixes trac #2485 --- driver/ghci/Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/driver/ghci/Makefile b/driver/ghci/Makefile index 94fe452..789aec0 100644 --- a/driver/ghci/Makefile +++ b/driver/ghci/Makefile @@ -29,22 +29,19 @@ LINK_TARGET = $(LINK)-$(ProjectVersion) INSTALLED_SCRIPT=$(DESTDIR)$(bindir)/$(LINK_TARGET) install:: $(RM) -f $(INSTALLED_SCRIPT) - echo "#!$(SHELL)" >> $(INSTALLED_SCRIPT) - echo "GHCBIN=$(libexecdir)/ghc-$(ProjectVersion)" >> $(INSTALLED_SCRIPT) - echo "TOPDIROPT=-B$(libdir)" >> $(INSTALLED_SCRIPT) - echo 'exec $$GHCBIN $$TOPDIROPT --interactive $${1+"$$@"}' >> $(INSTALLED_SCRIPT) + echo "#!$(SHELL)" >> $(INSTALLED_SCRIPT) + echo 'exec $(bindir)/ghc --interactive $${1+"$$@"}' >> $(INSTALLED_SCRIPT) $(EXECUTABLE_FILE) $(INSTALLED_SCRIPT) endif ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -INPLACE_SCRIPT=ghci-inplace +INPLACE_SCRIPT = ghci +INPLACE_GHC = $(FPTOOLS_TOP_ABS)/ghc/stage2-inplace/ghc CLEAN_FILES += $(INPLACE_SCRIPT) all:: $(RM) -f $(INPLACE_SCRIPT) - echo "#!$(SHELL)" >> $(INPLACE_SCRIPT) - echo "GHCBIN=$(FPTOOLS_TOP_ABS)/$(GHC_COMPILER_DIR_REL)/ghc-$(ProjectVersion)" >> $(INPLACE_SCRIPT) - echo "TOPDIROPT=$(FPTOOLS_TOP_ABS)" >> $(INPLACE_SCRIPT) - echo 'exec $$GHCPKGBIN --global-conf $$PKGCONF $${1+"$$@"}' >> $(INPLACE_SCRIPT) + echo "#!$(SHELL)" >> $(INPLACE_SCRIPT) + echo "exec $(INPLACE_GHC) --interactive $${1+"$$@"}" >> $(INPLACE_SCRIPT) $(EXECUTABLE_FILE) $(INPLACE_SCRIPT) endif -- 1.7.10.4