make sure to remove the right link before calling 'ln -s' (could we use 'ln -sf'?)
authorGabor Greif <ggreif@gmail.com>
Thu, 30 Aug 2012 13:02:56 +0000 (15:02 +0200)
committerGabor Greif <ggreif@gmail.com>
Thu, 30 Aug 2012 13:02:56 +0000 (15:02 +0200)
ghc/ghc.mk
utils/ghc-pkg/ghc.mk

index a13f03b..c45e288 100644 (file)
@@ -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
index 8ec3fd0..ba553d2 100644 (file)
@@ -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