Fix --distribution-label erroneously requiring --development.

Reported by @ensra.
This commit is contained in:
Peter Powell 2019-05-03 15:17:15 +01:00
parent 68e5d0a151
commit 044fa99968
2 changed files with 2 additions and 1 deletions

2
configure vendored
View File

@ -261,7 +261,7 @@ EOW
} }
# Check that the user actually wants this version. # Check that the user actually wants this version.
if ($version{LABEL} ne 'release') { if (defined $version{REAL_LABEL}) {
print_warning <<'EOW'; print_warning <<'EOW';
You are building a development version. This contains code which has You are building a development version. This contains code which has
not been tested as heavily and may contain various faults which could seriously not been tested as heavily and may contain various faults which could seriously

View File

@ -68,6 +68,7 @@ sub get_version {
# If the user has specified a distribution label then we use it in # If the user has specified a distribution label then we use it in
# place of the label from src/version.sh or Git. # place of the label from src/version.sh or Git.
$version{REAL_LABEL} = $version{LABEL};
$version{LABEL} = shift // $version{LABEL}; $version{LABEL} = shift // $version{LABEL};
# If any of these fields are missing then the user has deleted the # If any of these fields are missing then the user has deleted the