Commit 3b4e8524 authored by Alec Theriault's avatar Alec Theriault

Use `haddock-` prefixed Haddock opts in v2-install

See further discussion in #5788. Basically, `v2-install` currently
supports Haddock options, but in their unprefixed form. This is
unexpected and somewhat jarring.
parent 382a7712
......@@ -27,7 +27,8 @@ import Distribution.Client.CmdSdist
import Distribution.Client.Setup
( GlobalFlags(..), ConfigFlags(..), ConfigExFlags, InstallFlags(..)
, configureExOptions, installOptions, testOptions, liftOptions )
, configureExOptions, haddockOptions, installOptions, testOptions
, liftOptions )
import Distribution.Solver.Types.ConstraintSource
( ConstraintSource(..) )
import Distribution.Client.Types
......@@ -78,7 +79,7 @@ import Distribution.Client.InstallSymlink
( OverwritePolicy(..), symlinkBinary )
import Distribution.Simple.Setup
( Flag(..), HaddockFlags, TestFlags, fromFlagOrDefault, flagToMaybe
, trueArg, configureOptions, haddockOptions, flagToList, toFlag )
, trueArg, configureOptions, flagToList, toFlag )
import Distribution.Solver.Types.SourcePackage
( SourcePackage(..) )
import Distribution.ReadE
......
......@@ -25,7 +25,7 @@ module Distribution.Client.Setup
, replCommand, testCommand, benchmarkCommand, testOptions
, configureExOptions, reconfigureCommand
, installCommand, InstallFlags(..), installOptions, defaultInstallFlags
, filterHaddockArgs, filterHaddockFlags
, filterHaddockArgs, filterHaddockFlags, haddockOptions
, defaultSolver, defaultMaxBackjumps
, listCommand, ListFlags(..)
, updateCommand, UpdateFlags(..), defaultUpdateFlags
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment