From: janneke <janneke>
Date: Tue, 30 Aug 2005 19:25:37 +0000 (+0000)
Subject: Include MY_PATCH_LEVEL in config.make's
X-Git-Tag: release/2.7.16^2~195
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fb65535cee7c12a85ece1818698edb113e1b13f9;p=lilypond.git

Include MY_PATCH_LEVEL in config.make's
VERSION.
---

diff --git a/ChangeLog b/ChangeLog
index 9cc6f3b003..8398710b8e 100644
--- 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-30  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* lily/tie-column.cc (new_directions): put Tie down on center
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index d8830e8a24..397b9d8be8 100644
--- 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