From: simonmar <unknown>
Date: Mon, 26 Feb 2001 16:50:30 +0000 (+0000)
Subject: [project @ 2001-02-26 16:50:30 by simonmar]
X-Git-Tag: Approximately_9120_patches~2542
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=e466a2038f2b9be562a0d394f22b46a98be08cc3;p=ghc-hetmet.git

[project @ 2001-02-26 16:50:30 by simonmar]
make ghci-inplace work
---

diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile
index 9b6f969..3024d71 100644
--- a/ghc/driver/Makefile
+++ b/ghc/driver/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.53 2001/02/11 17:01:46 simonmar Exp $
+# $Id: Makefile,v 1.54 2001/02/26 16:50:30 simonmar Exp $
 #
 
 TOP=..
@@ -89,13 +89,15 @@ INPLACE_SCRIPT_PROG    = ghci-inplace
 
 SCRIPT_OBJS	  = ghci.sh
 INTERP		  = $(SHELL)
-SCRIPT_SUBST_VARS = GHCBIN
+SCRIPT_SUBST_VARS = GHCBIN TOPDIROPT
 INSTALL_SCRIPTS  += $(SCRIPT_PROG)
 
 ifeq "$(INSTALLING)" "1"
 SCRIPT_PROG 	=  $(INSTALLED_SCRIPT_PROG)
+TOPDIROPT	=  
 LINK 		=  ghci
 else
+TOPDIROPT	=  -B$(FPTOOLS_TOP_ABS)
 SCRIPT_PROG 	=  $(INPLACE_SCRIPT_PROG)
 endif
 
diff --git a/ghc/driver/ghci.sh b/ghc/driver/ghci.sh
index bed86ed..b020047 100644
--- a/ghc/driver/ghci.sh
+++ b/ghc/driver/ghci.sh
@@ -1,2 +1,2 @@
 # Mini-driver for GHCi
-exec $GHCBIN --interactive ${1+"$@"}
+exec $GHCBIN $TOPDIROPT --interactive ${1+"$@"}