Fix ghc and ghci wrappers on Windows

[ghc-hetmet.git] / driver / ghci / Makefile

diff --git a/driver/ghci/Makefile b/driver/ghci/Makefile
index 7c67ac5..47f51b8 100644 (file)
--- a/driver/ghci/Makefile
+++ b/driver/ghci/Makefile
@@ -5,65 +5,59 @@
 TOP=../..
 include $(TOP)/mk/boilerplate.mk
 
-# hack for ghci-inplace script, see below
-INSTALLING=1
-
 # -----------------------------------------------------------------------------
 # ghci script
 
-ifeq "$(INSTALLING)" "1"
-ifeq "$(BIN_DIST)"   "1"
-GHCBIN=$$\"\"libexecdir/ghc-$(ProjectVersion)
-GHCLIB=$$\"\"libdir
-else
-GHCBIN=$(libexecdir)/ghc-$(ProjectVersion)
-GHCLIB=$(libdir)
-endif # BIN_DIST
-else
-GHCBIN=$(FPTOOLS_TOP_ABS)/$(GHC_COMPILER_DIR_REL)/ghc-$(ProjectVersion)
-GHCLIB=$(FPTOOLS_TOP_ABS)
-endif
-
-INSTALLED_SCRIPT_PROG  = ghci-$(ProjectVersion)
-INPLACE_SCRIPT_PROG    = ghci-inplace
-
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-C_PROG = ghci
+C_PROG = ghci$(exeext)
+C_PROG_VERSIONED = ghci-$(ProjectVersion)$(exeext)
 C_OBJS += ghci.res
+
+all :: $(C_PROG_VERSIONED)
+$(C_PROG_VERSIONED) : $(C_PROG)
+       cp $< $@
 else
 C_SRCS=
 endif
 
-SCRIPT_OBJS      = ghci.sh
-INTERP           = $(SHELL)
-SCRIPT_SUBST_VARS = GHCBIN TOPDIROPT
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-INSTALL_SCRIPTS  += $(SCRIPT_PROG)
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+INSTALL_PROGS    += $(C_PROG) $(C_PROG_VERSIONED)
+GHCII_SCRIPT=$(DESTDIR)$(bindir)/ghcii.sh
+GHCII_SCRIPT_VERSIONED = $(DESTDIR)$(bindir)/ghcii-$(ProjectVersion).sh
+install::
+       $(RM) -f $(GHCII_SCRIPT)
+       echo "#!$(SHELL)"                                  >> $(GHCII_SCRIPT)
+       echo 'exec "$$0"/../ghc --interactive $${1+"$$@"}' >> $(GHCII_SCRIPT)
+       chmod +x $(GHCII_SCRIPT)
+       cp $(GHCII_SCRIPT) $(GHCII_SCRIPT_VERSIONED)
+       chmod +x $(GHCII_SCRIPT_VERSIONED)
 else
-INSTALL_SCRIPTS  += ghcii.sh
-INSTALL_PROGS    += $(C_PROG)
+LINK = ghci
+LINK_TARGET = $(LINK)-$(ProjectVersion)
+INSTALLED_SCRIPT=$(DESTDIR)$(bindir)/$(LINK_TARGET)
+install::
+       $(RM) -f $(INSTALLED_SCRIPT)
+       echo "#!$(SHELL)"                                   >> $(INSTALLED_SCRIPT)
+       echo 'exec $(bindir)/ghc-$(ProjectVersion) --interactive $${1+"$$@"}' >> $(INSTALLED_SCRIPT)
+       $(EXECUTABLE_FILE) $(INSTALLED_SCRIPT)
 endif
-TOPDIROPT        = -B$(GHCLIB)
 
-ifeq "$(INSTALLING)" "1"
-SCRIPT_PROG    =  $(INSTALLED_SCRIPT_PROG)
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-LINK           =  ghci
-endif
-else
-SCRIPT_PROG    =  $(INPLACE_SCRIPT_PROG)
-endif
-
-# don't recurse on 'make install'
-#
-ifeq "$(INSTALLING)" "1"
-all clean distclean maintainer-clean ::
-       $(MAKE) INSTALLING=0 BIN_DIST=0 $(MFLAGS) $@
+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 "exec $(INPLACE_GHC) --interactive $${1+"$$@"}" >> $(INPLACE_SCRIPT)
+       $(EXECUTABLE_FILE) $(INPLACE_SCRIPT)
 endif
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 ghci.res : ghci.rc ghci.ico
-       windres -o ghci.res -i ghci.rc -O coff
+       windres --preprocessor="$(CPP) -xc -DRC_INVOKED" -o ghci.res -i ghci.rc -O coff
 endif
 
+include $(TOP)/mk/bindist.mk
+
 include $(TOP)/mk/target.mk