From 3ad1a0bad2c701e19792618264d01f551c59a1bd Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Wed, 12 Oct 2016 20:10:43 +0100 Subject: Fix the distribution label not showing up since b8d85c6251. --- make/common.pm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'make/common.pm') diff --git a/make/common.pm b/make/common.pm index 53ee3f778..b1608db56 100644 --- a/make/common.pm +++ b/make/common.pm @@ -63,6 +63,10 @@ sub get_version { $version{LABEL} = $4 if defined $4; } + # If the user has specified a distribution label then we use it in + # place of the label from src/version.sh or Git. + $version{LABEL} = shift // $version{LABEL}; + # If any of these fields are missing then the user has deleted the # version file and is not running from Git. Fill in the fields with # dummy data so we don't get into trouble with undef values later. -- cgit v1.2.3