Commit 16a06107 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Fix ghc and ghci wrappers on Windows

parent 2719d1e5
......@@ -2,7 +2,7 @@ TOP=../..
include $(TOP)/mk/boilerplate.mk
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
C_PROG = ghc-$(ProjectVersion)
C_PROG = ghc-$(ProjectVersion)$(exeext)
INSTALL_PROGS += $(C_PROG)
else
SCRIPT_DIR = $(DESTDIR)$(bindir)
......
......@@ -9,8 +9,8 @@ include $(TOP)/mk/boilerplate.mk
# ghci script
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
C_PROG = ghci
C_PROG_VERSIONED = $(C_PROG)-$(ProjectVersion)
C_PROG = ghci$(exeext)
C_PROG_VERSIONED = ghci-$(ProjectVersion)$(exeext)
C_OBJS += ghci.res
all :: $(C_PROG_VERSIONED)
......
......@@ -145,7 +145,12 @@ ifneq "$(strip $(INSTALL_PROGS))" ""
# entry in the INSTALL_PROGS list. If there's no suffix, use
# $(exeext).
#
INSTALL_PROGS := $(foreach p, $(INSTALL_PROGS), $(addsuffix $(if $(suffix $(p)),,$(exeext)), $(basename $(p))))
INSTALL_PROGS := $(foreach p, $(INSTALL_PROGS),\
$(if $(filter $(exeext),$(suffix $p)),\
$p,\
$(addsuffix $(exeext),$p)\
)\
)
install:: $(INSTALL_PROGS)
$(INSTALL_DIR) $(DESTDIR)$(bindir)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment