From 3ad1a0bad2c701e19792618264d01f551c59a1bd Mon Sep 17 00:00:00 2001 From: Peter Powell Date: Wed, 12 Oct 2016 20:10:43 +0100 Subject: Fix the distribution label not showing up since b8d85c6251. --- configure | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'configure') diff --git a/configure b/configure index b81a7809a..696d94886 100755 --- a/configure +++ b/configure @@ -126,7 +126,7 @@ our $interactive = !( defined $opt_uid ); -my %version = get_version(); +my %version = get_version $opt_distribution_label; print_format "<|BOLD Configuring InspIRCd $version{FULL} on $^O.|>\n"; our %config; @@ -188,12 +188,6 @@ if (defined $opt_socketengine) { } } -# If the user has specified a distribution label then we use it in -# place of the label from src/version.sh or Git. -if (defined $opt_distribution_label) { - $version{LABEL} = $opt_distribution_label; -} - if (defined $opt_system) { $config{BASE_DIR} = $opt_prefix // '/var/lib/inspircd'; $config{BINARY_DIR} = $opt_binary_dir // '/usr/sbin'; @@ -310,6 +304,9 @@ if ( && prompt_bool $interactive, 'Would you like to ge system './tools/genssl', 'auto'; } +# Cache the distribution label so that its not lost when --update is run. +$config{DISTRIBUTION} = $opt_distribution_label if $opt_distribution_label; + write_configure_cache %config; parse_templates \%config, \%compiler, \%version; -- cgit v1.2.3