X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=driver%2Fghci%2FMakefile;h=54bd2466232a8e5555359da842656250b12f40ca;hb=6b1a6f305f801a1e2a90c3b513e76e7c2d221499;hp=94fe4529353a89a3af9ffba959b2aec2b32cf963;hpb=2de31b61d0a963803eb5632c9659c6093d74f345;p=ghc-hetmet.git

diff --git a/driver/ghci/Makefile b/driver/ghci/Makefile
index 94fe452..54bd246 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-$(ProjectVersion) --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