Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/12e03e0a2f8ecb4cbd3f426b43f414f51c1d2f51 >--------------------------------------------------------------- commit 12e03e0a2f8ecb4cbd3f426b43f414f51c1d2f51 Author: Duncan Coutts <[email protected]> Date: Sat Aug 2 13:38:55 2008 +0000 Fix generating haddock docs >--------------------------------------------------------------- cabal-install/Distribution/Client/Config.hs | 4 ++-- cabal-install/Distribution/Client/Logging.hs | 6 +++--- cabal-install/Distribution/Client/Reporting.hs | 4 ++-- cabal-install/cabal-install.cabal | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cabal-install/Distribution/Client/Config.hs b/cabal-install/Distribution/Client/Config.hs index c649eb7..30b2310 100644 --- a/cabal-install/Distribution/Client/Config.hs +++ b/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 diff --git a/cabal-install/Distribution/Client/Logging.hs b/cabal-install/Distribution/Client/Logging.hs index 46fae94..926c394 100644 --- a/cabal-install/Distribution/Client/Logging.hs +++ b/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? diff --git a/cabal-install/Distribution/Client/Reporting.hs b/cabal-install/Distribution/Client/Reporting.hs index 26d178a..a800aea 100644 --- a/cabal-install/Distribution/Client/Reporting.hs +++ b/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? diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index d0a7088..8b16ce9 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -92,3 +92,4 @@ Executable cabal cpp-options: -DWIN32 else build-depends: unix >= 2.2 && < 2.4 + extensions: CPP _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
