From 5cdc23a3e5d717a74776202f07f48e1dfbb19420 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 7 Mar 2018 15:58:04 +0100 Subject: [PATCH] Configure: don't mangle the directory again when checking DEPEND inclusion When generating the correct inclusion directory for DEPEND, we mangled it to be relative to the build or the source directory. However, the value we handle already come with a correct directory, so we only need to use it as is. Fixes #5543 Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/5546) (cherry picked from commit 906032d5a04f8cf8af5f515e0a8ea44a2285a2cc) --- Configure | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Configure b/Configure index bfd8b320c0..0585db9257 100755 --- a/Configure +++ b/Configure @@ -1877,16 +1877,12 @@ EOF next if $dest eq ""; foreach my $d (keys %{$unified_info{depends}->{$dest}}) { next unless $d =~ /\.(h|pm)$/; - if ($d eq "configdata.pm" - || defined($unified_info{generate}->{$d})) { - my $i = cleandir($blddir, dirname($d)); - push @{$unified_info{includes}->{$dest}->{build}}, $i - unless grep { $_ eq $i } @{$unified_info{includes}->{$dest}->{build}}; - } else { - my $i = cleandir($srcdir, dirname($d)); - push @{$unified_info{includes}->{$dest}->{source}}, $i - unless grep { $_ eq $i } @{$unified_info{includes}->{$dest}->{source}}; - } + my $i = dirname($d); + my $spot = + $d eq "configdata.pm" || defined($unified_info{generate}->{$d}) + ? 'build' : 'source'; + push @{$unified_info{includes}->{$dest}->{$spot}}, $i + unless grep { $_ eq $i } @{$unified_info{includes}->{$dest}->{$spot}}; } } -- 2.25.1