Include MY_PATCH_LEVEL in config.make's

VERSION.

diff --git a/ChangeLog b/ChangeLog
index 7d90151fdab448fd06366a4f6602879378708482..53b16f6bc4971320fa1ba92c79a6a793fdd65f39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-30  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * stepmake/aclocal.m4: Include MY_PATCH_LEVEL in config.make's
+       VERSION.
+
 2005-08-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * scripts/lilypond-book.py (get_latex_textwidth): remove unixisms

diff --git a/VERSION b/VERSION
index c39372e5e7259cb6e8708408fdf55db4b4330312..da074b02842695ba7de5112d6e6161c1d06defcf 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=6
 PATCH_LEVEL=3
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=1
 

diff --git a/ly/Welcome_to_LilyPond.ly b/ly/Welcome_to_LilyPond.ly
index 0948d3252306bdd212d729dd648459ea6fcdf8b1..220f869f29c40b2f0457e9b7cbb532a9029a7344 100644 (file)
--- a/ly/Welcome_to_LilyPond.ly
+++ b/ly/Welcome_to_LilyPond.ly
@@ -31,4 +31,4 @@ That's it.  For more information, visit http://lilypond.org .
 }
 
 
-\version "2.5.25"  % necessary for upgrading to future LilyPond versions.
+\version "2.6.0"  % necessary for upgrading to future LilyPond versions.

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index d8830e8a24ab5ddfea261e5293543ad704815fc3..397b9d8be800385291fe54abfd5d2bb09b9c6c38 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -581,11 +581,11 @@ AC_DEFUN(STEPMAKE_INIT, [
     . $srcdir/VERSION
     FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
     MICRO_VERSION=$PATCH_LEVEL
-    VERSION=$FULL_VERSION
     TOPLEVEL_VERSION=$FULL_VERSION
     if test x$MY_PATCH_LEVEL != x; then
        FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL
     fi
+    VERSION=$FULL_VERSION
     export MAJOR_VERSION MINOR_VERSION PATCH_LEVEL
     # urg: don't "fix" this: irix doesn't know about [:lower:] and [:upper:]
     changequote(<<, >>)#dnl