[commit: packages/Cabal] ghc-head: Move the setting of 'haddockDistPref' to 'installUnpackedPackage'. (d33e4e9)

[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=d33e4e9f33963ba3df09f87daeef27c47d5fa22f

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

commit d33e4e9f33963ba3df09f87daeef27c47d5fa22f
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Wed May 29 15:58:38 2013 +0200

    Move the setting of 'haddockDistPref' to 'installUnpackedPackage'.


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

d33e4e9f33963ba3df09f87daeef27c47d5fa22f
 cabal-install/Distribution/Client/Install.hs |    3 ++-
 cabal-install/Main.hs                        |    3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs
index c057bf3..362b656 100644
--- a/cabal-install/Distribution/Client/Install.hs
+++ b/cabal-install/Distribution/Client/Install.hs
@@ -1203,7 +1203,8 @@ installUnpackedPackage verbosity buildLimit installLock numJobs
     }
     shouldHaddock    = fromFlag (installDocumentation installConfigFlags)
     haddockFlags' _   = haddockFlags {
-      haddockVerbosity = toFlag verbosity'
+      haddockVerbosity = toFlag verbosity',
+      haddockDistPref  = configDistPref configFlags
     }
     testsEnabled = fromFlag (configTests configFlags)
     testFlags _ = Cabal.emptyTestFlags {
diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs
index 5fff705..d0d945a 100644
--- a/cabal-install/Main.hs
+++ b/cabal-install/Main.hs
@@ -479,7 +479,6 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags)
       installFlags'   = defaultInstallFlags          `mappend`
                         savedInstallFlags     config `mappend` installFlags
       globalFlags'    = savedGlobalFlags      config `mappend` globalFlags
-      haddockFlags'   = haddockFlags { haddockDistPref = sandboxDistPref }
   (comp, platform, conf) <- configCompilerAux' configFlags'
 
   -- If we're working inside a sandbox and the user has set the -w option, we
@@ -513,7 +512,7 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags)
               comp platform conf
               useSandbox mSandboxPkgInfo
               globalFlags' configFlags'' configExFlags'
-              installFlags' haddockFlags'
+              installFlags' haddockFlags
               targets
 
 testAction :: (TestFlags, BuildExFlags) -> [String] -> GlobalFlags -> IO ()