From 0447b529bd30c4bd2123cbb3384ea5f0a472b3a7 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 3 Sep 2017 10:28:06 +0200 Subject: [PATCH] Make: Make src/scripts/gen-tarball-version a bit nicer When autoconf is stale, include a reminder how to fix that in the error message. While there, cd to $nv like we do in src/scripts/gen-client-configure for slightly terser code. Signed-off-by: Markus Armbruster --- src/scripts/gen-tarball-version | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/scripts/gen-tarball-version b/src/scripts/gen-tarball-version index 222dc9864..2c49b1c4b 100755 --- a/src/scripts/gen-tarball-version +++ b/src/scripts/gen-tarball-version @@ -5,14 +5,14 @@ if [ $# = 0 ]; then exit 1 fi -nv=$1-$2 +cd "$1-$2" -printf "%s" "$2" >$nv/.tarball-version ->$nv/.dirty-stamp +printf "%s" "$2" >.tarball-version +>.dirty-stamp -if [ "$2" != "`$nv/configure --version | sed -n '/^Wolfpack Empire/s/.* //p'`" ] +if [ "$2" != "`./configure --version | sed -n '/^Wolfpack Empire/s/.* //p'`" ] then echo "Output of configure --version does not match $2" >&2 - echo "Need to regenerate stale configure?" >&2 + echo "Need to regenerate stale configure with 'autoconf -f'?" >&2 exit 1 fi -- 2.43.0