* lily/main.cc:

* configure.in: Cosmetic fixes.

diff --git a/ChangeLog b/ChangeLog
index c60e6971cfdbbb61e349adb575a57e1853fc5c0b..f28856eb6d374302648be4283bf0cdad9ef76fcc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-04  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * lily/main.cc: 
+       * configure.in: Cosmetic fixes.
+
 2006-01-04  Mats Bengtsson  <mabe@drongo.s3.kth.se>
 
        * Documentation/user/music-glossary.tely (Pitch names): Added

diff --git a/configure.in b/configure.in
index cce8c31358d5326013a5630d9960720498359740..68d2ad7baf0431b5c6983a2bd98dcae1e172b728 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -35,10 +35,10 @@ AC_ARG_ENABLE(gui,
 
 
 NCSB_DIR=unknown
-AC_ARG_ENABLE(ncsb,
-[  --enable-ncsb-dir      set the path where Century Schoolbook fonts can be found.
+AC_ARG_WITH(ncsb,
+[  --with-ncsb-dir=DIR     location of Century Schoolbook fonts
                             Default: detect with locate(1)],
-    [NCSB_DIR=$enableval])
+    [NCSB_DIR=$withval])
 
 
 reloc_b=no
@@ -49,7 +49,7 @@ AC_ARG_ENABLE(relocation,
 FRAMEWORKDIR=".."
 AC_ARG_WITH(framework-dir,
     [  --with-framework-dir=DIR
-       relative the optional framework directory],[
+                          relative location of framework],[
        if test "$withval" = "yes" -o "$withval" = "no"; then
            AC_MSG_WARN(Usage: --with-framework-dir=../lib/FRAMEWORK/DIR)
        else

diff --git a/lily/main.cc b/lily/main.cc
index 4bbf7cf93989ed08bc319c45eeb3bc0f5eee4e47..419f407772aa3dbb7b5813b057ab4ebad27242cc 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -169,12 +169,12 @@ static Long_option_init options_static[]
   {_i ("FIELD"), "header", 'H',  _i ("dump a header field to file BASENAME.FIELD")},
   {_i ("DIR"), "include", 'I',  _i ("add DIR to search path")},
   {_i ("FILE"), "init", 'i',  _i ("use FILE as init file")},
-  {_i ("FILE"), "output", 'o',  _i ("write output to FILE (suffix will be added)")},
 #if HAVE_CHROOT
   {_i ("USER,GROUP,JAIL,DIR"), "jail", 'j', _i ("chroot to JAIL, become USER:GROUP\n"
                                                "and cd into DIR")},
 #endif
   {0, "no-print", 0, _i ("do not generate printed output")},
+  {_i ("FILE"), "output", 'o',  _i ("write output to FILE (suffix will be added)")},
   {0, "preview", 'p',  _i ("generate a preview of the first system")},
   {0, "safe-mode", 's',  _i ("disallow unsafe Scheme and PostScript operations")},
   {0, "version", 'v',  _i ("print version number")},

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index c5eea55ace0fb70cd2428003fa5b8be700f5e87e..4df01ca3ce5fe58443df211a80d6d11c06aa788c 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -894,8 +894,7 @@ AC_DEFUN(STEPMAKE_LOCALE, [
 
     # with/enable ??
     AC_ARG_WITH(localedir,
-    [  --with-localedir=LOCALE use LOCALE as locale dir.  Default:
-                            PREFIX/share/locale ],
+    [  --with-localedir=DIR    location of locales.  Default: PREFIX/share/locale ],
     localedir=$with_localedir,
     localedir='${prefix}/share/locale')
 
@@ -1011,7 +1010,7 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
            ])
     
     AC_ARG_WITH(python-lib,
-       [  --with-python-lib=NAME name of the python lib],[
+       [  --with-python-lib=NAME  name of the python lib],[
            if test "$withval" = "yes" -o "$withval" = "no"; then
                AC_MSG_WARN(Usage: --with-python-lib=name)
            else