diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2016-11-25 15:17:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-25 15:17:09 +0100 |
| commit | 7ee8ea71b7d6e939d8e08d332feee2a27d662155 (patch) | |
| tree | 2b55effb2608f58c46daff537e5f0e1bfaae5fdd /make | |
| parent | 8189eb162eeef6a080bee90b6d6bac119ce4739c (diff) | |
| parent | 3ad1a0bad2c701e19792618264d01f551c59a1bd (diff) | |
Merge pull request #1252 from SaberUK/master+distribution
Fix the distribution label not showing up since b8d85c6251.
Diffstat (limited to 'make')
| -rw-r--r-- | make/common.pm | 4 | ||||
| -rw-r--r-- | make/configure.pm | 5 |
2 files changed, 7 insertions, 2 deletions
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. diff --git a/make/configure.pm b/make/configure.pm index e88454658..6b4693d45 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -159,7 +159,8 @@ MISC OPTIONS --socketengine=[name] Sets the socket engine to be used. Possible values are $SELIST. --uid=[id|name] Sets the user to run InspIRCd as. - --update Updates the build environment. + --update Updates the build environment with the settings + from the cache. FLAGS @@ -180,7 +181,7 @@ sub cmd_update { say 'Updating...'; my %config = read_configure_cache(); my %compiler = get_compiler_info($config{CXX}); - my %version = get_version(); + my %version = get_version $config{DISTRIBUTION}; parse_templates(\%config, \%compiler, \%version); say 'Update complete!'; exit 0; |