patch::: 1.3.25.jcn2

1.3.25.jcn2
===========

* lilypond as as2ly: --help and --version to stdout.  Regular identify
  to stderr.  This fixes help2man's manpage generation.

* configure: substitute full path for perl and guile in scripts.

diff --git a/CHANGES b/CHANGES
index a77d84589e0acdb9c665c44897bfe33dab696aef..fbbf8f0bf8018f3154ea8d973efe20dfc004595d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+1.3.25.jcn2
+===========
+
+* lilypond as as2ly: --help and --version to stdout.  Regular identify 
+  to stderr.  This fixes help2man's manpage generation.
+
+* configure: substitute full path for perl and guile in scripts.
+
 1.3.25.jcn1
 ===========
 

diff --git a/VERSION b/VERSION
index 4faea06aaa0480336f3ef852584d042866088bfe..ba81df2fe1b958d89988b78570fd27708be9df94 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=25
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/aclocal.m4 b/aclocal.m4
index c3aad4ba2156cf7a7040ad330f7cefe9f567adfc..3db837d204b4e2b4c85a7911787febcd4250bd9f 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2,8 +2,6 @@ dnl WARNING WARNING WARNING WARNING
 dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
 dnl WARNING WARNING WARNING WARNING
 dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
 dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 
@@ -162,6 +160,8 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [
     if guile-config --version 2>&1 | grep -q 'version 1\.[012]'; then
        AC_STEPMAKE_WARN(Guile version 1.3 or better needed)
     fi
+    AC_PATH_PROG(GUILE, guile, error)
+    AC_SUBST(GUILE)
 ])
 
 AC_DEFUN(AC_STEPMAKE_INIT, [

diff --git a/config.make.in b/config.make.in
index 2ace88be93d81f164a83af6186bfc8632c3d3021..91b7accc0105347d0fe7893ac162306449f055f2 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -46,6 +46,7 @@ BASH = @BASH@
 BISON = @BISON@
 FIND = @FIND@
 FLEX = @FLEX@
+GUILE = @GUILE@
 INIMETAFONT = @INIMETAFONT@
 INIMETAPOST = @INIMETAPOST@
 INIMETAPOST_FLAGS = @INIMETAPOST_FLAGS@

diff --git a/configure.in b/configure.in
index d1fff38d708860e4b0e7f9a942b89699905bdd36..0b83441d4d58dd23dbdf0f383e2811ad009e5be8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -56,7 +56,7 @@ AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, "${FULL_VERSION}")
 AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
 
 AC_CHECK_PROGS(MAKEINFO, makeinfo, error)
-AC_CHECK_PROGS(PERL, perl, error)
+AC_PATH_PROG(PERL, perl, error)
 
 
 AC_STEPMAKE_END

diff --git a/lily/main.cc b/lily/main.cc
index 913810a2d4e05de0f655090cb1310fe6cdd24406..cd2ee91d95cdfe45d2aacb01b24458eb5357db51 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -86,9 +86,17 @@ Long_option_init theopts[] = {
   {0,0,0, 0}
 };
 
+void
+identify (ostream* os)
+{
+  *os << gnu_lilypond_version_str () << endl;
+}
+
 void
 usage ()
 {
+  identify (&cout);
+  cout << "\n";
   cout << _f ("Usage: %s [OPTION]... [FILE]...", "lilypond");
   cout << "\n\n";
   cout << _ ("Typeset music and or play MIDI from FILE");
@@ -127,16 +135,10 @@ _(
   cout << _f ("Report bugs to %s", "bug-gnu-music@gnu.org") << endl;
 }
 
-void
-identify ()
-{
-  cerr << gnu_lilypond_version_str () << endl;
-}
-
 void
 version ()
 {
-  identify ();
+  identify (&cout);
   cout << '\n';
   cout << _f (""
   "This is free software.  It is covered by the GNU General Public License,\n"
@@ -352,7 +354,7 @@ main (int argc, char **argv)
          break;
        }
     }
-  identify ();
+  identify (&cerr);
 
 #ifdef WINNT
   gh_enter (argc, argv, main_prog);

diff --git a/make/substitute.make b/make/substitute.make
index 4a991ee000359043d688f4a87825899d18714ef2..c4be0de6aeb17cee06d1b43537c08d7301ac765d 100644 (file)
--- a/make/substitute.make
+++ b/make/substitute.make
@@ -7,6 +7,7 @@ include $(stepdir)/substitute-rules.make
 ATVARIABLES = \
   BASH\
   DATE\
+  GUILE\
   date\
   datadir\
   PACKAGE\

diff --git a/scripts/as2text.scm b/scripts/as2text.scm
index ced2dcbb388bc53edd75af9cc97d280a4b910432..b6cd31355f73d5b6a19fcd204884442055a611e6 100644 (file)
--- a/scripts/as2text.scm
+++ b/scripts/as2text.scm
@@ -1,4 +1,4 @@
-#!/usr/bin/guile \
+#!@GUILE@ \
 -e main -s
 !#
 ;;;; as2text.scm -- Translate AsciiScript to Text
@@ -28,10 +28,10 @@
       "unknown"
       subst-version))
 
-(define (show-version)
+(define (show-version port)
   (display (string-append 
            program-name " - LilyPond version " program-version "\n")
-          (current-error-port)))
+          port))
 
 (define (show-help)
   (display "Convert AsciiScript to text.
@@ -43,7 +43,7 @@ Options:
   -h,--help          this help
   -o,--output=FILE   set output file
   -v,--version       show version
-" (current-error-port)))
+"))
 
 (define (gulp-file name)
   (let ((port (if (equal? name "-")
@@ -86,7 +86,6 @@ Options:
   (set! lily-home (string-append 
                     (dirname (dirname (car args))) 
                     "/share/lilypond"))
-  (show-version)
   (let ((options (getopt-long args
                              `((output (single-char #\o)
                                           (value #t))
@@ -97,11 +96,12 @@ Options:
         (if pair (cdr pair) default)))
 
     (if (assq 'help options)
-       (begin (show-help) (exit 0)))
-           
+       (begin (show-version (current-output-port)) (show-help) (exit 0)))
+
     (if (assq 'version options)
-       (exit 0))
+       (begin (show-version (current-output-port)) (exit 0)))
 
+    (show-version (current-error-port))
     (let ((output-name (opt 'output "-"))
          (files (let ((foo (opt '() '())))
                      (if (null? foo) 
@@ -394,3 +394,4 @@ Options:
                   (c (get-char font n)))
                  (plot-char c)
                  (rmove-to (char-width c) 0)))))
+

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 930659f86268fa5f7d874e917be172ada0aa2c7f..3db837d204b4e2b4c85a7911787febcd4250bd9f 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -160,6 +160,8 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [
     if guile-config --version 2>&1 | grep -q 'version 1\.[012]'; then
        AC_STEPMAKE_WARN(Guile version 1.3 or better needed)
     fi
+    AC_PATH_PROG(GUILE, guile, error)
+    AC_SUBST(GUILE)
 ])
 
 AC_DEFUN(AC_STEPMAKE_INIT, [