diff --git a/ChangeLog b/ChangeLog index a276e71c5ce..e884e8f36a6 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 cba43849241..e963aa98704 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 \