+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
===========
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.
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
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, [
BISON = @BISON@
FIND = @FIND@
FLEX = @FLEX@
+GUILE = @GUILE@
INIMETAFONT = @INIMETAFONT@
INIMETAPOST = @INIMETAPOST@
INIMETAPOST_FLAGS = @INIMETAPOST_FLAGS@
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
{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");
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"
break;
}
}
- identify ();
+ identify (&cerr);
#ifdef WINNT
gh_enter (argc, argv, main_prog);
ATVARIABLES = \
BASH\
DATE\
+ GUILE\
date\
datadir\
PACKAGE\
-#!/usr/bin/guile \
+#!@GUILE@ \
-e main -s
!#
;;;; as2text.scm -- Translate AsciiScript to Text
"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.
-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 "-")
(set! lily-home (string-append
(dirname (dirname (car args)))
"/share/lilypond"))
- (show-version)
(let ((options (getopt-long args
`((output (single-char #\o)
(value #t))
(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)
(c (get-char font n)))
(plot-char c)
(rmove-to (char-width c) 0)))))
+
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, [