From e1ca734edd17a90a325d5b566a4ea96e66c206e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Wed, 19 Dec 2018 13:33:09 +0100
Subject: meson: allow setting the version string during configuration

This will be useful when building distro packages, because we can set the
version string to the rpm/dpkg/whatever version string, and getter reports
from end users.
---
 tools/meson-vcs-tag.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'tools/meson-vcs-tag.sh')

diff --git a/tools/meson-vcs-tag.sh b/tools/meson-vcs-tag.sh
index 4345c2145a..1eb7668eed 100755
--- a/tools/meson-vcs-tag.sh
+++ b/tools/meson-vcs-tag.sh
@@ -4,7 +4,13 @@ set -eu
 set -o pipefail
 
 dir="$1"
-fallback="$2"
+tag="$2"
+fallback="$3"
+
+if [ -n "$tag" ]; then
+        echo "$tag"
+        exit 0
+fi
 
 # Apparently git describe has a bug where it always considers the work-tree
 # dirty when invoked with --git-dir (even though 'git status' is happy). Work
-- 
cgit v1.2.1