From a037bb48f8b299c644fcb442b6495aa297878711 Mon Sep 17 00:00:00 2001
From: Duncan Coutts <duncan@haskell.org>
Date: Sun, 31 Aug 2008 21:50:54 +0000
Subject: [PATCH] Use the new Program utils to simplify code in Configure
---
Distribution/Simple/Configure.hs | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/Distribution/Simple/Configure.hs b/Distribution/Simple/Configure.hs
index d7dc9c1152..d886a09fd0 100644
--- a/Distribution/Simple/Configure.hs
+++ b/Distribution/Simple/Configure.hs
@@ -91,7 +91,7 @@ import Distribution.Simple.Program
( Program(..), ProgramLocation(..), ConfiguredProgram(..)
, ProgramConfiguration, defaultProgramConfiguration
, configureAllKnownPrograms, knownPrograms
- , userSpecifyArgs, userSpecifyPath
+ , userSpecifyArgss, userSpecifyPaths
, lookupKnownProgram, requireProgram, pkgConfigProgram
, rawSystemProgramStdoutConf )
import Distribution.Simple.Setup
@@ -272,12 +272,9 @@ configure (pkg_descr0, pbi) cfg
createDirectoryIfMissingVerbose (lessVerbose verbosity) True distPref
- let programsConfig =
- flip (foldl userSpecifyArgs') (configProgramArgs cfg)
- . flip (foldl userSpecifyPath') (configProgramPaths cfg)
- $ configPrograms cfg
- userSpecifyArgs' conf (prog, args) = userSpecifyArgs prog args conf
- userSpecifyPath' conf (prog, path) = userSpecifyPath prog path conf
+ let programsConfig = userSpecifyArgss (configProgramArgs cfg)
+ . userSpecifyPaths (configProgramPaths cfg)
+ $ configPrograms cfg
userInstall = fromFlag (configUserInstall cfg)
defaultPackageDB | userInstall = UserPackageDB
| otherwise = GlobalPackageDB
--
GitLab