Mercurial > hg > octave-lojdl > gnulib-hg
changeset 14117:ca7dbca5f7c7
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 <gary@gnu.org>
| author | Gary V. Vaughan <gary@gnu.org> |
|---|---|
| date | Wed, 08 Dec 2010 20:59:59 +0700 |
| parents | a852b7d09546 |
| children | 733b45c14610 |
| files | ChangeLog libposix/configure.ac libposix/mk-tarball |
| diffstat | 3 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2010-12-07 Gary V. Vaughan <gary@gnu.org> + + 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 <bkorb@gnu.org> * libposix/lib/Makefile.am (lpx-config.h): generate the new header
--- 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])
--- a/libposix/mk-tarball +++ b/libposix/mk-tarball @@ -63,8 +63,7 @@ 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