X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fghc.mk;h=a3973bf79db4c07bafdae5ad7ba5621aeb70c8d7;hb=609e7ddfb10bc04762b820e70e0487ad6c514c2e;hp=6d6652a17a3d5cc1a90f8b5638774ab80a15755b;hpb=e51cdf9b6e54fb4052e46b6d7afb15e062928467;p=ghc-hetmet.git

diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index 6d6652a..a3973bf 100644
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -89,6 +89,12 @@ ghc_stage3_SHELL_WRAPPER_NAME = ghc/ghc.wrapper
 ghc_stage$(INSTALL_GHC_STAGE)_INSTALL_SHELL_WRAPPER = YES
 ghc_stage$(INSTALL_GHC_STAGE)_INSTALL_SHELL_WRAPPER_NAME = ghc-$(ProjectVersion)
 
+# We override the program name to be ghc, rather than ghc-stage2.
+# This means the right program name is used in error messages etc.
+define ghc_stage$(INSTALL_GHC_STAGE)_INSTALL_SHELL_WRAPPER_EXTRA
+echo 'executablename="$$exedir/ghc"' >> "$(WRAPPER)"
+endef
+
 # stage 1 is enabled unless $(stage) is set to something other than 1
 ifeq "$(filter-out 1,$(stage))" ""
 $(eval $(call build-prog,ghc,stage1,0))
@@ -153,8 +159,8 @@ ifeq "$(Windows)" "NO"
 install: install_ghc_link
 .PNONY: install_ghc_link
 install_ghc_link: 
-	"$(RM)" $(RM_OPTS) $(DESTDIR)$(bindir)/ghc
-	$(LN_S) ghc-$(ProjectVersion) $(DESTDIR)$(bindir)/ghc
+	"$(RM)" $(RM_OPTS) "$(DESTDIR)$(bindir)/ghc"
+	$(LN_S) ghc-$(ProjectVersion) "$(DESTDIR)$(bindir)/ghc"
 else
 # On Windows we install the main binary as $(bindir)/ghc.exe
 # To get ghc-<version>.exe we have a little C program in driver/ghc