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.

diff --git a/ChangeLog b/ChangeLog
index a276e71c5ce78dc3b72fa8117ee1462cda25e940..e884e8f36a69dce64bac333e57da22018c71d0cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-29  Joel Brobecker  <brobecker@adacore.com>
+
+       * src-release (VER): Strip any "-cvs" suffix from the version
+       number, if extracted from $(TOOL)/version.in.
+
 2013-02-15  Yufeng Zhang  <yufeng.zhang@arm.com>
 
        * configure.ac: Sync with GCC repo.

diff --git a/src-release b/src-release
index cba438492415794ebe2c147612700fbc22e1106d..e963aa9870448a74e530fbca20c6c7855f1cb294 100644 (file)
--- 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 \