Update my name and email address.

[user/henk/code/inspircd.git] / make / common.pm

diff --git a/make/common.pm b/make/common.pm
index 6ca280bece1f8307df33491fffca887385772e82..dd15c8b8f39a620253e365a22240bfd8ce9ee2e5 100644 (file)
--- a/make/common.pm
+++ b/make/common.pm
@@ -1,7 +1,7 @@
 #
 # InspIRCd -- Internet Relay Chat Daemon
 #
-#   Copyright (C) 2013-2017 Peter Powell <petpow@saberuk.com>
+#   Copyright (C) 2013-2017 Sadie Powell <sadie@witchery.services>
 #
 # This file is part of InspIRCd.  InspIRCd is free software: you can
 # redistribute it and/or modify it under the terms of the GNU General Public
@@ -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