[commit: ghc] wip/nfs-locking: simplify code and fix naming conventions based on Andrey's comments (06fb099)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/06fb099d3fe8a253d79f7af4aa7d67cc5ef91bcc/ghc

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

commit 06fb099d3fe8a253d79f7af4aa7d67cc5ef91bcc
Author: Karel Gardas <karel.gardas at centrum.cz>
Date:   Tue Jan 19 22:27:36 2016 +0100

    simplify code and fix naming conventions based on Andrey's comments


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

06fb099d3fe8a253d79f7af4aa7d67cc5ef91bcc
 src/Settings/Packages/IntegerGmp.hs | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/Settings/Packages/IntegerGmp.hs b/src/Settings/Packages/IntegerGmp.hs
index 657eed0..9ad160f 100644
--- a/src/Settings/Packages/IntegerGmp.hs
+++ b/src/Settings/Packages/IntegerGmp.hs
@@ -15,17 +15,13 @@ import Oracles.Config.Setting
 integerGmpPackageArgs :: Args
 integerGmpPackageArgs = package integerGmp ? do
     let includeGmp = "-I" ++ gmpBuildPath -/- "include"
-    gmp_includedir <- getSetting GmpIncludeDir
-    gmp_libdir <- getSetting GmpLibDir
-    let gmp_args = if (gmp_includedir == "" && gmp_libdir == "")
-                   then
-                   [ arg "--configure-option=--with-intree-gmp" ]
-                   else
-                   []
+    gmpIncludeDir <- getSetting GmpIncludeDir
+    gmpLibDir <- getSetting GmpLibDir
 
     mconcat [ builder GhcCabal ? mconcat
-              (gmp_args ++
-               [ appendSub "--configure-option=CFLAGS" [includeGmp]
-               , appendSub "--gcc-options"             [includeGmp] ] )
+              [ (null gmpIncludeDir && null gmpLibDir) ?
+                arg "--configure-option=--with-intree-gmp"
+              , appendSub "--configure-option=CFLAGS" [includeGmp]
+              , appendSub "--gcc-options"             [includeGmp] ]
 
             , builderGcc ? arg includeGmp ]