]> git.pond.sub.org Git - empserver/commitdiff
Make: Make src/scripts/gen-tarball-version a bit nicer
authorMarkus Armbruster <armbru@pond.sub.org>
Sun, 3 Sep 2017 08:28:06 +0000 (10:28 +0200)
committerMarkus Armbruster <armbru@pond.sub.org>
Sun, 3 Sep 2017 08:28:06 +0000 (10:28 +0200)
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 <armbru@pond.sub.org>
src/scripts/gen-tarball-version

index 222dc9864a6c69b473bf6e133e0b9993c3b2a84a..2c49b1c4bdb257ed27ce45a39fdcbeeebf0a593a 100755 (executable)
@@ -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