From 97390253a11a01eec0f30758ac67e6cdb7585d73 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Thu, 29 Aug 2013 18:25:41 +0000 Subject: src-release: Strip "-cvs" suffix in version number. For some reason not understood, src-release produces tarballs where the version number in the tarball name includes the "-cvs" suffix. Looking at the snapshots produced in the past for CVS snashots, the "-cvs" suffix was NOT included. This new -cvs suffix is therefore now causing a mismatch between what the scripts expect and what this makefile produces. This patch fixes the issue by stripping the "-cvs" suffix, if present, from the version number. ChangeLog: * src-release (VER): Strip any "-cvs" suffix from the version number, if extracted from $(TOOL)/version.in. --- ChangeLog | 5 +++++ src-release | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a276e71..e884e8f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-08-29 Joel Brobecker + + * src-release (VER): Strip any "-cvs" suffix from the version + number, if extracted from $(TOOL)/version.in. + 2013-02-15 Yufeng Zhang * configure.ac: Sync with GCC repo. diff --git a/src-release b/src-release index cba4384..e963aa9 100644 --- a/src-release +++ b/src-release @@ -71,7 +71,7 @@ VER = ` if grep 'AM_INIT_AUTOMAKE.*BFD_VERSION' $(TOOL)/configure.in >/dev/null elif grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \ sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \ elif test -f $(TOOL)/version.in; then \ - head -1 $(TOOL)/version.in; \ + head -1 $(TOOL)/version.in | sed 's/-cvs$$//'; \ elif grep VERSION $(TOOL)/Makefile.in > /dev/null 2>&1; then \ sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \ else \ -- cgit v1.1