[commit: integer-gmp] master: Fix GMP_PREFER_FRAMEWORK (0092e88)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/integer-gmp

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0092e8824f4b319d4619969ff7199ef438cef306

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

commit 0092e8824f4b319d4619969ff7199ef438cef306
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sat Feb 9 21:56:25 2013 +0000

    Fix GMP_PREFER_FRAMEWORK
    
    It doesn't look like the old code could have worked

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

 gmp/ghc.mk |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gmp/ghc.mk b/gmp/ghc.mk
index 227b52b..f6f3539 100644
--- a/gmp/ghc.mk
+++ b/gmp/ghc.mk
@@ -36,7 +36,11 @@ endif
 ifeq "$(Windows)" "YES"
 # Apparently building on Windows fails when there is a system gmp
 # available, so we never try to use the system gmp on Windows
-libraries/integer-gmp_dist-install_CONFIGURE_OPTS += --configure-option=--with-intree-gmp
+libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-intree-gmp
+endif
+
+ifeq "$(GMP_PREFER_FRAMEWORK)" "YES"
+libraries/integer-gmp_CONFIGURE_OPTS += --with-gmp-framework-preferred
 endif
 
 ifeq "$(phase)" "final"
@@ -45,10 +49,6 @@ ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
 include libraries/integer-gmp/gmp/config.mk
 endif
 
-ifeq "$(GMP_PREFER_FRAMEWORK)" "YES"
-libraries/integer-gmp_CC_OPTS += --with-gmp-framework-preferred
-endif
-
 libraries/integer-gmp_CC_OPTS += $(addprefix -I,$(GMP_INCLUDE_DIRS))
 libraries/integer-gmp_CC_OPTS += $(addprefix -L,$(GMP_LIB_DIRS))