diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-08-25 18:32:47 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-08-25 18:32:47 +0000 |
| commit | e1826dcc04394bc35769573eea250ada2e1ad1a0 (patch) | |
| tree | 5ff5b781376fa535aa1074391d1b8724d90f6429 /driver | |
| parent | bef67119f9d329f4d41abef55a67db6b9baad83b (diff) | |
| download | haskell-e1826dcc04394bc35769573eea250ada2e1ad1a0.tar.gz | |
Fix the ghci script; fixes trac #2485
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/ghci/Makefile | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/driver/ghci/Makefile b/driver/ghci/Makefile index 94fe452935..789aec0c21 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 |