[commit: packages/Cabal] ghc-head: Unbreak the build. (77b659c)

[git at git.haskell.org]

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

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=77b659c73e94e15e587c02e88a74bd5adc69aa8e

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

commit 77b659c73e94e15e587c02e88a74bd5adc69aa8e
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Thu May 30 18:07:51 2013 +0200

    Unbreak the build.


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

77b659c73e94e15e587c02e88a74bd5adc69aa8e
 cabal-install/Distribution/Client/Config.hs |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cabal-install/Distribution/Client/Config.hs b/cabal-install/Distribution/Client/Config.hs
index 17c52b0..a14965a 100644
--- a/cabal-install/Distribution/Client/Config.hs
+++ b/cabal-install/Distribution/Client/Config.hs
@@ -50,7 +50,7 @@ import Distribution.Simple.Compiler
 import Distribution.Simple.Setup
          ( ConfigFlags(..), configureOptions, defaultConfigFlags
          , installDirsOptions
-         , programConfigurationPaths, programConfigurationOptions
+         , programConfigurationPaths', programConfigurationOptions
          , Flag(..), toFlag, flagToMaybe, fromFlagOrDefault )
 import Distribution.Simple.InstallDirs
          ( InstallDirs(..), defaultInstallDirs
@@ -578,11 +578,11 @@ installDirsFields = map viewAsFieldDescr installDirsOptions
 withProgramsFields :: [FieldDescr [(String, FilePath)]]
 withProgramsFields =
   map viewAsFieldDescr $
-  programConfigurationPaths defaultProgramConfiguration ParseArgs id (++)
+  programConfigurationPaths' (++ "-location") defaultProgramConfiguration
+                             ParseArgs id (++)
 
 -- | Fields for the 'program-default-options' section.
 withProgramOptionsFields :: [FieldDescr [(String, [String])]]
 withProgramOptionsFields =
   map viewAsFieldDescr $
-  programConfigurationOptions' (++ "-location") defaultProgramConfiguration
-                               ParseArgs id (++)
+  programConfigurationOptions defaultProgramConfiguration ParseArgs id (++)