CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/05/31 20:57:14
Modified files:
stepmake : aclocal.m4
. : ChangeLog
Log message:
More autopackage friendliness.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/stepmake/aclocal.m4.diff?tr1=1.146&tr2=1.147&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3698&tr2=1.3699&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3698 lilypond/ChangeLog:1.3699
--- lilypond/ChangeLog:1.3698 Tue May 31 19:18:35 2005
+++ lilypond/ChangeLog Tue May 31 20:57:14 2005
@@ -1,3 +1,7 @@
+2005-05-31 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * stepmake/aclocal.m4: More autopackage friendliness.
+
2005-05-31 Graham Percival <[EMAIL PROTECTED]>
* Documentation/index.html.in: remove link to LSR.
@@ -39,7 +43,7 @@
2005-05-31 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
- * configure.in (reloc_b): Add --enable-argv0-relocation.
+ * configure.in (reloc_b): Add --enable-relocation.
2005-05-31 Han-Wen Nienhuys <[EMAIL PROTECTED]>
Index: lilypond/stepmake/aclocal.m4
diff -u lilypond/stepmake/aclocal.m4:1.146 lilypond/stepmake/aclocal.m4:1.147
--- lilypond/stepmake/aclocal.m4:1.146 Tue May 31 14:09:00 2005
+++ lilypond/stepmake/aclocal.m4 Tue May 31 20:57:14 2005
@@ -580,6 +580,9 @@
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_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.
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
