diff options
| author | Gabor Greif <ggreif@gmail.com> | 2012-08-30 15:02:56 +0200 |
|---|---|---|
| committer | Gabor Greif <ggreif@gmail.com> | 2012-08-30 15:02:56 +0200 |
| commit | b660cc0b3f6ea09ecc7f8fdef9ac79704c3ccaf0 (patch) | |
| tree | 7e1e699a469c86b9df22b4abf8ca211d9bd59aa8 | |
| parent | bcef1e2847ce009f0b139abce1fb664733768c50 (diff) | |
| download | haskell-b660cc0b3f6ea09ecc7f8fdef9ac79704c3ccaf0.tar.gz | |
make sure to remove the right link before calling 'ln -s' (could we use 'ln -sf'?)
| -rw-r--r-- | ghc/ghc.mk | 4 | ||||
| -rw-r--r-- | utils/ghc-pkg/ghc.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ghc/ghc.mk b/ghc/ghc.mk index a13f03b875..c45e28891a 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 8ec3fd0097..ba553d29e9 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 |