Split the --help output into several paragraphs.

diff --git a/ChangeLog b/ChangeLog
index 1ba8bc3bc9c4d393413619e3957d64102acc6a4c..48dc54d01559f3d9628d08ba6ca2139f7053314a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2006-07-29  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (func_usage): Revert most of the 2006-07-15 change.
+       Categorize the options by when they are useful.
 
 2006-07-29  Bruno Haible  <bruno@clisp.org>
 

diff --git a/gnulib-tool b/gnulib-tool
index 9a5661118df65d8848ee62eb4c4dd66e803e840b..6af18fe95ac1369bed07f2402a3655bfcee19b34 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-07-29 12:55:43 $'
+cvsdatestamp='$Date: 2006-07-29 13:04:18 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -100,22 +100,28 @@ Operation modes:
       --extract-maintainer         report the maintainer(s) inside gnulib
       --extract-tests-module       report the unit test module, if it exists
 
-Options:
+General options:
       --dir=DIRECTORY       Specify the target directory.
                             For --import, this specifies where your
                             configure.ac can be found.  Defaults to current
                             directory.
+      --assume-autoconf=VERSION
+                            Assume a given autoconf version (or newer).
+                            If VERSION is 'latest-stable', assume the latest
+                            stable version.
+
+Options for --import:
       --lib=LIBRARY         Specify the library name.  Defaults to 'libgnu'.
       --source-base=DIRECTORY
                             Directory relative to --dir where source code is
-                            placed (default \"lib\"), for --import.
+                            placed (default \"lib\").
       --m4-base=DIRECTORY   Directory relative to --dir where *.m4 macros are
-                            placed (default \"m4\"), for --import.
+                            placed (default \"m4\").
+      --doc-base=DIRECTORY  Directory relative to --dir where doc files are
+                            placed (default \"doc\").
       --tests-base=DIRECTORY
                             Directory relative to --dir where unit tests are
-                            placed (default \"tests\"), for --import.
-      --doc-base=DIRECTORY  Directory relative to --dir where doc files are
-                            placed (default \"doc\"), for --import.
+                            placed (default \"tests\").
       --aux-dir=DIRECTORY   Directory relative to --dir where auxiliary build
                             tools are placed (default \"build-aux\").
       --with-tests          Include unit tests for the included modules.
@@ -124,14 +130,12 @@ Options:
                             This option can be repeated.
       --lgpl                Abort if modules aren't available under the LGPL.
                             Also modify license template from GPL to LGPL.
-      --libtool             Use libtool rules, for --import.
+      --libtool             Use libtool rules.
       --macro-prefix=PREFIX  Specify the prefix of the macros 'gl_EARLY' and
                             'gl_INIT'. Default is 'gl'.
-      --assume-autoconf=VERSION
-                            Assume a given autoconf version (or newer).
-                            If VERSION is 'latest-stable', assume the latest
-                            stable version.
       --no-changelog        don't update or create ChangeLog files
+
+Options for --import and --update:
       --dry-run             For --import, only print what would have been done.
   -s, --symbolic, --symlink Make symbolic links instead of copying files.