[commit: ghc] master: small build system tweak (2ede632)

[Ian Lynagh]

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

On branch  : master

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

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

commit 2ede632e20450baef41241e8cbf5d18db4db8f4e
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sat Mar 2 01:11:58 2013 +0000

    small build system tweak

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

 driver/ghci/ghc.mk | 2 ++
 ghc.mk             | 8 +-------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/driver/ghci/ghc.mk b/driver/ghci/ghc.mk
index ad11ee1..c231347 100644
--- a/driver/ghci/ghc.mk
+++ b/driver/ghci/ghc.mk
@@ -10,6 +10,7 @@
 #
 # -----------------------------------------------------------------------------
 
+ifeq "$(GhcWithInterpreter)" "YES"
 ifneq "$(Windows_Host)" "YES"
 
 install: install_driver_ghci
@@ -62,4 +63,5 @@ install_driver_ghcii:
 	$(EXECUTABLE_FILE) $(GHCII_SCRIPT_VERSIONED)
 
 endif
+endif
 
diff --git a/ghc.mk b/ghc.mk
index f469bee..91ddbe3 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -607,14 +607,8 @@ ifneq "$(BINDIST)" "YES"
 BUILD_DIRS += $(GHC_GENPRIMOP_DIR)
 endif
 
-ifeq "$(Stage1Only)-$(phase)" "YES-final"
-MAYBE_GHCI=
-else
-MAYBE_GHCI=driver/ghci
-endif
-
 BUILD_DIRS += driver
-BUILD_DIRS += $(MAYBE_GHCI)
+BUILD_DIRS += driver/ghci
 BUILD_DIRS += driver/ghc
 BUILD_DIRS += driver/haddock
 BUILD_DIRS += libffi