[project @ 2003-08-17 01:36:54 by sof]

[ghc-hetmet.git] / ghc / utils / ghc-pkg / Main.hs

diff --git a/ghc/utils/ghc-pkg/Main.hs b/ghc/utils/ghc-pkg/Main.hs
index 1e850ef..2b51934 100644 (file)
--- a/ghc/utils/ghc-pkg/Main.hs
+++ b/ghc/utils/ghc-pkg/Main.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -fglasgow-exts #-}
 
 -----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.33 2003/05/16 08:35:49 simonmar Exp $
+-- $Id: Main.hs,v 1.35 2003/08/17 01:36:54 sof Exp $
 --
 -- Package management tool
 -----------------------------------------------------------------------------
@@ -75,7 +75,7 @@ flags = [
        "Use the specified package config file",
   Option ['l'] ["list-packages"] (NoArg List)
        "List packages in all config files",
-  Option ['L'] ["list-packages-local"] (NoArg ListLocal)
+  Option ['L'] ["list-local-packages"] (NoArg ListLocal)
        "List packages in the specified config file",
   Option ['a'] ["add-package"] (NoArg (Add False))
        "Add a new package",
@@ -382,7 +382,7 @@ expandEnvVars pkg force = do
           (nm,_:remainder) -> do
              nm'  <- lookupEnvVar nm
              str' <- expandString remainder
-             return (nm' ++ str')
+             return (xs ++ nm' ++ str')
           _ -> return str -- no closing '}'
        _ -> return str