X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=94e9080909fe67b4e1d407fbecc28a7d019574c0;hb=f5b3f16c9321a1594ce1ed0b73914feabaa321a8;hp=240804931923d98abc38f8d61476234d2099be35;hpb=a075bccf8a21c3b98640b4f72a0ab7084c9b0882;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 2408049..94e9080 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -781,6 +781,9 @@ else
 	for i in $(INSTALL_LIBEXECS); do \
 		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(ghclibexecdir)"; \
 	done
+# We rename ghc-stage2, so that the right program name is used in error
+# messages etc.
+	"$(MV)" "$(DESTDIR)$(ghclibexecdir)/ghc-stage2" "$(DESTDIR)$(ghclibexecdir)/ghc"
 endif
 
 install_topdir_scripts: $(INSTALL_TOPDIR_SCRIPTS)
@@ -827,7 +830,7 @@ INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d
 # Install packages in the right order, so that ghc-pkg doesn't complain.
 # Also, install ghc-pkg first.
 ifeq "$(Windows)" "NO"
-INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/ghc-stage2
+INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/ghc
 INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/ghc-pkg
 else
 INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe