[commit: ghc] master: installation fixes (2bdc4fd)

[Ian Lynagh]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2bdc4fdc00f1124ee7f379057a357c1beabbf11c

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

commit 2bdc4fdc00f1124ee7f379057a357c1beabbf11c
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Mar 3 21:26:25 2013 +0000

    installation fixes

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

 ghc.mk                 | 2 +-
 utils/ghc-cabal/ghc.mk | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ghc.mk b/ghc.mk
index 9bd8600..6d0b379 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -984,7 +984,7 @@ unix-binary-dist-prep:
 	echo "BUILD_DOCBOOK_PS   = $(BUILD_DOCBOOK_PS)"   >> $(BIN_DIST_MK)
 	echo "BUILD_DOCBOOK_PDF  = $(BUILD_DOCBOOK_PDF)"  >> $(BIN_DIST_MK)
 	echo "BUILD_MAN          = $(BUILD_MAN)"          >> $(BIN_DIST_MK)
-	echo "ghc-cabal_INPLACE  = utils/ghc-cabal/dist-install/build/tmp/ghc-cabal-bindist" >> $(BIN_DIST_MK)
+	echo "override ghc-cabal_INPLACE = utils/ghc-cabal/dist-install/build/tmp/ghc-cabal-bindist" >> $(BIN_DIST_MK)
 	echo "UseSystemLibFFI    = $(UseSystemLibFFI)"    >> $(BIN_DIST_MK)
 	cd $(BIN_DIST_PREP_DIR) && autoreconf
 	$(call removeFiles,$(BIN_DIST_PREP_TAR))
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk
index db12598..5835749 100644
--- a/utils/ghc-cabal/ghc.mk
+++ b/utils/ghc-cabal/ghc.mk
@@ -20,6 +20,7 @@ CABAL_CONSTRAINT := --constraint="Cabal == $(CABAL_DOTTED_VERSION)"
 
 ghc-cabal_INPLACE = inplace/bin/ghc-cabal$(exeext)
 
+ifneq "$(BINDIST)" "YES"
 $(ghc-cabal_INPLACE) : utils/ghc-cabal/dist/build/tmp/ghc-cabal$(exeext) | $$(dir $$@)/.
 	"$(CP)" $< $@
 
@@ -40,6 +41,7 @@ utils/ghc-cabal/dist/build/tmp/ghc-cabal$(exeext): utils/ghc-cabal/Main.hs $(TOU
 	       -ilibraries/hpc \
 	       $(utils/ghc-cabal_dist_EXTRA_HC_OPTS)
 	"$(TOUCH_CMD)" $@
+endif
 
 # touch is required, because otherwise if mkdirhier is newer, we
 # repeatedly rebuild ghc-cabal.