From: Gary V. Vaughan Date: Wed, 8 Dec 2010 13:59:59 +0000 (+0700) Subject: libposix: version filter script was adding a newline X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=54446af5dd71cbf60294225f1bb2599111ba9d4f;p=gnulib.git libposix: version filter script was adding a newline * libposix/configure.ac (AC_INIT): Use the output of git-version-gen unmodified, os per other GNU projects... otherwise the spurious newline added to the version number breaks operation of the configure script (tested with Autoconf-2.68). * libposix/mk-tarball: Remove the filter here too, otherwise we'll end up with two conflicting version numbers in the same release! Signed-off-by: Gary V. Vaughan --- diff --git a/ChangeLog b/ChangeLog index 5f1f5cc02e..91f772f78a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2010-12-07 Gary V. Vaughan + + libposix: version filter script was adding a newline + * libposix/configure.ac (AC_INIT): Use the output of + git-version-gen unmodified, os per other GNU projects... + otherwise the spurious newline added to the version number + breaks operation of the configure script (tested with + Autoconf-2.68). + * libposix/mk-tarball: Remove the filter here too, otherwise + we'll end up with two conflicting version numbers in the same + release! + 2010-11-17 Bruce Korb * libposix/lib/Makefile.am (lpx-config.h): generate the new header diff --git a/libposix/configure.ac b/libposix/configure.ac index 455b8574d9..2d9809118c 100644 --- a/libposix/configure.ac +++ b/libposix/configure.ac @@ -1,6 +1,5 @@ AC_INIT([GNU libposix], - m4_esyscmd([./git-version-gen .tarball-version | \ - sed 's/-dirty/-modified/']), + m4_esyscmd([./git-version-gen .tarball-version]), [bug-gnulib@gnu.org]) AS_BOX([Configuring AC_PACKAGE_TARNAME AC_PACKAGE_VERSION]) diff --git a/libposix/mk-tarball b/libposix/mk-tarball index d3bc4eeba8..1139476be8 100755 --- a/libposix/mk-tarball +++ b/libposix/mk-tarball @@ -63,8 +63,7 @@ func_mkver() sed '1,/^$/d;s/^#/ */;/http:\/\/www\.gnu\.org/q' ${prognam} echo ' */' - gv=`../build-aux/git-version-gen .tarball-version | \ - sed 's/-dirty/-modified/'` + gv=`../build-aux/git-version-gen .tarball-version` sedcmd='/^2[01][0-9][0-9]-[0-1][0-9]-[0-3][0-9] /{ s/ .*// s/-/./gp