X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=driver%2Fghci%2FMakefile;h=8a282af41686254331fe159a758691fab43c620f;hp=14e0c33775b02c4d90bff6bfe78e61dc120ca955;hb=c004ec62b41aa2137b5b5e298ca562609b0de92e;hpb=430453c5131592b6147a80202dc5f7fbe3f3d5fd diff --git a/driver/ghci/Makefile b/driver/ghci/Makefile index 14e0c33..8a282af 100644 --- a/driver/ghci/Makefile +++ b/driver/ghci/Makefile @@ -5,9 +5,6 @@ TOP=../.. include $(TOP)/mk/boilerplate.mk -# hack for ghci-inplace script, see below -INSTALLING=1 - # ----------------------------------------------------------------------------- # ghci script @@ -20,15 +17,15 @@ endif ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" INSTALL_PROGS += $(C_PROG) -GHCII_SCRIPT=$(bindir)/ghcii.sh +GHCII_SCRIPT=$(DESTDIR)$(bindir)/ghcii.sh install:: $(RM) -f $(GHCII_SCRIPT) - echo "#!$(SHELL)" >> $(GHCII_SCRIPT) - echo 'exec "$0"/../ghc --interactive $${1+"$$@"}' >> $(GHCII_SCRIPT) + echo "#!$(SHELL)" >> $(GHCII_SCRIPT) + echo 'exec "$$0"/../ghc --interactive $${1+"$$@"}' >> $(GHCII_SCRIPT) else LINK = ghci LINK_TARGET = $(LINK)-$(ProjectVersion) -INSTALLED_SCRIPT=$(bindir)/$(LINK_TARGET) +INSTALLED_SCRIPT=$(DESTDIR)$(bindir)/$(LINK_TARGET) install:: $(RM) -f $(INSTALLED_SCRIPT) echo "#!$(SHELL)" >> $(INSTALLED_SCRIPT) @@ -39,7 +36,8 @@ install:: endif ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -INPLACE_SCRIPT=ghc-pkg-inplace +INPLACE_SCRIPT=ghci-inplace +CLEAN_FILES += $(INPLACE_SCRIPT) all:: $(RM) -f $(INPLACE_SCRIPT) echo "#!$(SHELL)" >> $(INPLACE_SCRIPT) @@ -49,16 +47,13 @@ all:: $(EXECUTABLE_FILE) $(INPLACE_SCRIPT) endif -# don't recurse on 'make install' -# -ifeq "$(INSTALLING)" "1" -all clean distclean maintainer-clean :: - $(MAKE) INSTALLING=0 $(MFLAGS) $@ -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 +binary-dist: + $(INSTALL_DIR) $(BIN_DIST_DIR)/driver/ghci + $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/driver/ghci/ + include $(TOP)/mk/target.mk