From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 31 May 2005 20:57:14 +0000 (+0000)
Subject: More autopackage friendliness.
X-Git-Tag: release/2.5.28~34
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b07b2e74928ba245ee27316985392ee004ffaf99;p=lilypond.git

More autopackage friendliness.
---

diff --git a/ChangeLog b/ChangeLog
index b481b06575..c67428b8fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-31  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* stepmake/aclocal.m4: More autopackage friendliness.
+
 2005-05-31  Graham Percival  <gperlist@shaw.ca>
 
 	* Documentation/index.html.in: remove link to LSR.
@@ -39,7 +43,7 @@
 
 2005-05-31  Jan Nieuwenhuizen  <janneke@gnu.org>
 
-	* configure.in (reloc_b): Add --enable-argv0-relocation.
+	* configure.in (reloc_b): Add --enable-relocation.
 
 2005-05-31  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index e249e98a67..d8830e8a24 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -580,6 +580,9 @@ AC_DEFUN(STEPMAKE_INIT, [
     AC_PREREQ(2.50)
     . $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
@@ -662,8 +665,14 @@ AC_DEFUN(STEPMAKE_INIT, [
     AC_SUBST(package)
     AC_SUBST(PACKAGE)
     AC_SUBST(PACKAGE_NAME)
+    AC_SUBST(VERSION)
     AC_SUBST(MAJOR_VERSION)
     AC_SUBST(MINOR_VERSION)
+    AC_SUBST(MICRO_VERSION)
+
+    # stepmake nonstandard names
+    AC_SUBST(PATCH_LEVEL)
+    AC_SUBST(TOPLEVEL_VERSION)
     
     # We don't need the upper case variant,
     # so stick to macros are uppercase convention.