X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=make%2Fcommon.pm;h=742d372245619a4138dc22119cb7cd521c9cd734;hb=1cf76f8aae0d2be86f85c7abfc3b885f2d6a6441;hp=6ca280bece1f8307df33491fffca887385772e82;hpb=c6a508a3da977041909f18f77d6e8fea942512cf;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/make/common.pm b/make/common.pm index 6ca280bec..742d37224 100644 --- a/make/common.pm +++ b/make/common.pm @@ -59,7 +59,7 @@ sub get_version { # Attempt to retrieve missing version information from Git chomp(my $gr = `git describe --tags 2>/dev/null`); - if ($gr =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\d+-g(\w+))?$/) { + if ($gr =~ /^v([0-9]+)\.([0-9]+)\.([0-9]+)(?:[a-z]+\d+)?(?:-\d+-g(\w+))?$/) { $version{MAJOR} //= $1; $version{MINOR} //= $2; $version{PATCH} //= $3; @@ -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