[commit: ghc] master: make sure to remove the right link before calling 'ln -s' (could we use 'ln -sf'?) (b660cc0)

[Gabor Greif]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/b660cc0b3f6ea09ecc7f8fdef9ac79704c3ccaf0

>---------------------------------------------------------------

commit b660cc0b3f6ea09ecc7f8fdef9ac79704c3ccaf0
Author: Gabor Greif <ggreif at gmail.com>
Date:   Thu Aug 30 15:02:56 2012 +0200

    make sure to remove the right link before calling 'ln -s' (could we use 'ln -sf'?)

>---------------------------------------------------------------

 ghc/ghc.mk           |    4 ++--
 utils/ghc-pkg/ghc.mk |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ghc/ghc.mk b/ghc/ghc.mk
index a13f03b..c45e288 100644
--- a/ghc/ghc.mk
+++ b/ghc/ghc.mk
@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 #
-# (c) 2009 The University of Glasgow
+# (c) 2009-2012 The University of Glasgow
 #
 # This file is part of the GHC build system.
 #
@@ -159,7 +159,7 @@ ifeq "$(Windows)" "NO"
 install: install_ghc_link
 .PHONY: install_ghc_link
 install_ghc_link: 
-	$(call removeFiles,"$(DESTDIR)$(bindir)/ghc")
+	$(call removeFiles,"$(DESTDIR)$(bindir)/$(CrossCompilePrefix)ghc")
 	$(LN_S) $(CrossCompilePrefix)ghc-$(ProjectVersion) "$(DESTDIR)$(bindir)/$(CrossCompilePrefix)ghc"
 else
 # On Windows we install the main binary as $(bindir)/ghc.exe
diff --git a/utils/ghc-pkg/ghc.mk b/utils/ghc-pkg/ghc.mk
index 8ec3fd0..ba553d2 100644
--- a/utils/ghc-pkg/ghc.mk
+++ b/utils/ghc-pkg/ghc.mk
@@ -1,6 +1,6 @@
 # -----------------------------------------------------------------------------
 #
-# (c) 2009 The University of Glasgow
+# (c) 2009-2012 The University of Glasgow
 #
 # This file is part of the GHC build system.
 #
@@ -116,7 +116,7 @@ install: install_utils/ghc-pkg_link
 .PHONY: install_utils/ghc-pkg_link
 install_utils/ghc-pkg_link: 
 	$(call INSTALL_DIR,"$(DESTDIR)$(bindir)")
-	$(call removeFiles,"$(DESTDIR)$(bindir)/ghc-pkg")
+	$(call removeFiles,"$(DESTDIR)$(bindir)/$(CrossCompilePrefix)ghc-pkg")
 	$(LN_S) $(CrossCompilePrefix)ghc-pkg-$(ProjectVersion) "$(DESTDIR)$(bindir)/$(CrossCompilePrefix)ghc-pkg"
 endif