Fix generating haddock docs

cabal-install/Distribution/Client/Config.hs

@@ -147,8 +147,8 @@ defaultSavedConfig =
              , ConfigFlags.configVerbosity   = toFlag normal
              , ConfigFlags.configUserInstall = toFlag defaultUserInstall
              , ConfigFlags.configInstallDirs = error
-               "ConfigFlags.installDirs: avoid this field. Use UserInstallDirs \
-              \ or GlobalInstallDirs instead"
+               "ConfigFlags.installDirs: avoid this field."
+               --use UserInstallDirs or GlobalInstallDirs instead
              }
          , configUserInstallDirs   = userInstallDirs
          , configGlobalInstallDirs = defaultGlobalInstallDirs

cabal-install/Distribution/Client/Logging.hs

@@ -83,7 +83,7 @@ data BuildLogEntry
     -- | The package this build report is about
     package         :: PackageIdentifier,
 
-    -- | Which hackage server this package is from or local
+    --   Which hackage server this package is from or local
 --    server          :: Maybe URI,
 
     -- | The OS and Arch the package was built on
@@ -105,10 +105,10 @@ data BuildLogEntry
     -- | Did installing work ok?
     installOutcome  :: InstallOutcome,
 
-    -- | Which version of the Cabal library was used to compile the Setup.hs
+    --   Which version of the Cabal library was used to compile the Setup.hs
 --    cabalVersion    :: Version,
 
-    -- | Which build tools we were using (with versions)
+    --   Which build tools we were using (with versions)
 --    tools      :: [PackageIdentifier],
 
     -- | Configure outcome, did configure work ok?

cabal-install/Distribution/Client/Reporting.hs

@@ -98,10 +98,10 @@ data BuildReport
     -- | Did installing work ok?
     installOutcome  :: InstallOutcome,
 
-    -- | Which version of the Cabal library was used to compile the Setup.hs
+    --   Which version of the Cabal library was used to compile the Setup.hs
 --    cabalVersion    :: Version,
 
-    -- | Which build tools we were using (with versions)
+    --   Which build tools we were using (with versions)
 --    tools      :: [PackageIdentifier],
 
     -- | Configure outcome, did configure work ok?

cabal-install/cabal-install.cabal

@@ -92,3 +92,4 @@ Executable cabal
       cpp-options: -DWIN32
     else
       build-depends: unix >= 2.2 && < 2.4
+    extensions: CPP