Mercurial > hg > octave-kai > gnulib-hg
changeset 13854:6419b9b1ea92
bootstrap: allow FreeBSD gzip
$ gzip --version > /dev/null
FreeBSD gzip 20100407
* build-aux/bootstrap (get_version): Parse FreeBSD gzip version,
which has no '.' and goes to stderr.
* build-aux/bootstrap.conf (buildreq): Improve the sample file.
Reported by Matthias Bolte.
Signed-off-by: Eric Blake <eblake@redhat.com>
author | Eric Blake <eblake@redhat.com> |
---|---|
date | Fri, 12 Nov 2010 13:50:48 -0700 |
parents | 2f3dbd409322 |
children | 78d646edb95c |
files | ChangeLog build-aux/bootstrap build-aux/bootstrap.conf |
diffstat | 3 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2010-11-12 Eric Blake <eblake@redhat.com> + bootstrap: allow FreeBSD gzip + * build-aux/bootstrap (get_version): Parse FreeBSD gzip version, + which has no '.' and goes to stderr. + * build-aux/bootstrap.conf (buildreq): Improve the sample file. + Reported by Matthias Bolte. + maintainer-makefile: check for i18n setup * top/maint.mk (sc_bindtextdomain): Check for evidence that _() will likely work.
--- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2010-10-08.16; # UTC +scriptversion=2010-11-12.20; # UTC # Bootstrap this package from checked-out sources. @@ -345,11 +345,11 @@ $app --version 2>&1 | sed -n '# extract version within line - s/.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/ + s/.*[v ]\{1,\}\([0-9]\{1,\}\(\.[.a-z0-9-]*\)*\).*/\1/ t done # extract version at start of line - s/^\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/ + s/^\([0-9]\{1,\}\(\.[.a-z0-9-]*\)\)*.*/\1/ t done d