From 044fa999680888267e07dc7b69028b18efbac818 Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Fri, 3 May 2019 15:17:15 +0100 Subject: [PATCH] Fix --distribution-label erroneously requiring --development. Reported by @ensra. --- configure | 2 +- make/common.pm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index a9d02ffc44..269d1927f3 100755 --- a/configure +++ b/configure @@ -261,7 +261,7 @@ EOW } # Check that the user actually wants this version. -if ($version{LABEL} ne 'release') { +if (defined $version{REAL_LABEL}) { print_warning <<'EOW'; You are building a development version. This contains code which has not been tested as heavily and may contain various faults which could seriously diff --git a/make/common.pm b/make/common.pm index ba6b03f87d..742d372245 100644 --- a/make/common.pm +++ b/make/common.pm @@ -68,6 +68,7 @@ sub get_version { # If the user has specified a distribution label then we use it in # place of the label from src/version.sh or Git. + $version{REAL_LABEL} = $version{LABEL}; $version{LABEL} = shift // $version{LABEL}; # If any of these fields are missing then the user has deleted the