[project @ 2003-05-30 13:32:20 by simonmar]

Rename --list-packages-local to --list-local-packages, because it
seems that having one long option which is a prefix of another doesn't
work too well with GetOpt.

diff --git a/ghc/docs/users_guide/packages.sgml b/ghc/docs/users_guide/packages.sgml
index e6f0b7b..a01ae53 100644 (file)
--- a/ghc/docs/users_guide/packages.sgml
+++ b/ghc/docs/users_guide/packages.sgml
@@ -322,9 +322,9 @@
        </varlistentry>
 
        <varlistentry>
-         <term><option>&ndash;&ndash;list-packages-local</option></term>
+         <term><option>&ndash;&ndash;list-local-packages</option></term>
          <term><option>-L</option></term>
-         <indexterm><primary><option>&ndash;&ndash;list-packages-local</option></primary></indexterm>
+         <indexterm><primary><option>&ndash;&ndash;list-local-packages</option></primary></indexterm>
          <listitem>
            <para>Displays the list of packages installed in the
            topmost configuration file only: that will be the

diff --git a/ghc/utils/ghc-pkg/Main.hs b/ghc/utils/ghc-pkg/Main.hs
index 1e850ef..24092ab 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.34 2003/05/30 13:32:20 simonmar 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",