[commit: ghc] master: Accept -package-conf so cabal-install works (e5191c9)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/e5191c953bb24a20321e8422317e017f39a10857

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

commit e5191c953bb24a20321e8422317e017f39a10857
Author: Ian Lynagh <igloo at earth.li>
Date:   Sun May 27 17:38:52 2012 +0100

    Accept -package-conf so cabal-install works
    
    Really we ought to support all the old flags, but warn that they
    are deprecated.

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

 utils/ghc-pkg/Main.hs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
index 83b5447..3389c07 100644
--- a/utils/ghc-pkg/Main.hs
+++ b/utils/ghc-pkg/Main.hs
@@ -129,7 +129,7 @@ flags = [
         "use the current user's package database",
   Option [] ["global"] (NoArg FlagGlobal)
         "use the global package database",
-  Option ['f'] ["package-db"] (ReqArg FlagConfig "FILE")
+  Option ['f'] ["package-db", "package-conf"] (ReqArg FlagConfig "FILE")
         "use the specified package config file",
   Option [] ["global-package-db"] (ReqArg FlagGlobalConfig "FILE")
         "location of the global package config",