From 80a18dca963ad5de80113e4de1e52b34320a1171 Mon Sep 17 00:00:00 2001 From: Scott James Remnant Date: Sun, 15 Feb 2004 17:57:31 +0000 Subject: [PATCH] * Makefile.am (m4/ltversion.m4): Generate serial number by removing initial '1.' from the revision, replace @MACRO_SERIAL@ with this new variable. * m4/ltversion.in: Use @MACRO_SERIAL@ for the serial number as some shells don't like a '.' when using test. --- ChangeLog | 6 ++++++ Makefile.am | 2 ++ m4/ltversion.in | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b88bb526a..ee9d654d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2004-02-15 Scott James Remnant + * Makefile.am (m4/ltversion.m4): Generate serial number by + removing initial '1.' from the revision, replace @MACRO_SERIAL@ + with this new variable. + * m4/ltversion.in: Use @MACRO_SERIAL@ for the serial number + as some shells don't like a '.' when using test. + * m4/ltversion.in: Add a serial number to this file otherwise libtoolize will refuse to copy it into $pkgdatadir, where it is needed by m4/libtool.m4. diff --git a/Makefile.am b/Makefile.am index 579917b90..a91c911d2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,8 +48,10 @@ pkgmacro_DATA = m4/libtool.m4 m4/ltdl.m4 m4/ltsugar.m4 m4/ltversion.m4 EXTRA_DIST += m4/ltversion.in $(top_srcdir)/m4/ltversion.m4: $(top_srcdir)/m4/ltversion.in stamp-vcl set `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; \ + serial=`echo $$1 | sed 's,^1[.],,g'`; \ sed -e "s,[@]MACRO_VERSION[@],$(VERSION),g" \ -e "s,[@]MACRO_REVISION[@],$$1,g" \ + -e "s,[@]MACRO_SERIAL[@],$$serial,g" \ -e "s,[@]configure_input[@],Generated from ltversion.in; do not edit by hand.,g" \ $(top_srcdir)/m4/ltversion.in > $@t chmod a-w $@t diff --git a/m4/ltversion.in b/m4/ltversion.in index 710bb8837..4a805198c 100644 --- a/m4/ltversion.in +++ b/m4/ltversion.in @@ -1,7 +1,7 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # @configure_input@ -# serial @MACRO_REVISION@ +# serial @MACRO_SERIAL@ # This file is part of GNU Libtool m4_define([LT_PACKAGE_VERSION], [@MACRO_VERSION@]) -- 2.47.2