[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [FYI] add serial to ltversion.in (Was: ltversion)
From: |
Scott James Remnant |
Subject: |
Re: [FYI] add serial to ltversion.in (Was: ltversion) |
Date: |
Sun, 15 Feb 2004 17:57:48 +0000 |
On Sun, 2004-02-15 at 17:44, Scott James Remnant wrote:
> On Sun, 2004-02-15 at 16:02, Patrick Welche wrote:
>
> > * Makefile.am (pkgmacro_DATA): We have to distribute
> > m4/ltversion.m4 because it can be needed before the Makefile
> > that generates it exists.
> >
> > but:
> >
> > libtoolize: warning: no serial number on
> > `/usr/local/share/libtool/m4/ltversion.m4', not copying.
> >
> Well caught, we don't have anything that tests libtoolize during
> 'make check', so I missed this one. I'll look into that later this
> evening.
>
> Attached patch applied to HEAD.
>
Tsk, test your patches before you commit them Scott... apply this one
afterwards, some shells don't like a '.' in their numbers.
Scott
--
Have you ever, ever felt like this?
Had strange things happen? Are you going round the twist?
diff -ruNp libtool-CVS~/ChangeLog libtool-CVS/ChangeLog
--- libtool-CVS~/ChangeLog 2004-02-15 17:48:12.000000000 +0000
+++ libtool-CVS/ChangeLog 2004-02-15 17:55:55.000000000 +0000
@@ -0,0 +1,8 @@
+2004-02-15 Scott James Remnant <address@hidden>
+
+ * 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.
+
diff -ruNp libtool-CVS~/m4/ltversion.in libtool-CVS/m4/ltversion.in
--- libtool-CVS~/m4/ltversion.in 2004-02-15 17:48:12.000000000 +0000
+++ libtool-CVS/m4/ltversion.in 2004-02-15 17:53:22.000000000 +0000
@@ -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], address@hidden@])
diff -ruNp libtool-CVS~/Makefile.am libtool-CVS/Makefile.am
--- libtool-CVS~/Makefile.am 2004-02-13 00:36:05.000000000 +0000
+++ libtool-CVS/Makefile.am 2004-02-15 17:53:33.000000000 +0000
@@ -48,8 +48,10 @@ pkgmacro_DATA = m4/libtool.m4 m4/ltdl.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,address@hidden@],$(VERSION),g" \
-e "s,address@hidden@],$$1,g" \
+ -e "s,address@hidden@],$$serial,g" \
-e "s,address@hidden@],Generated from ltversion.in; do not edit by
hand.,g" \
$(top_srcdir)/m4/ltversion.in > address@hidden
chmod a-w address@hidden
signature.asc
Description: This is a digitally signed message part