diff options
author | Richard Levitte <levitte@openssl.org> | 2018-03-07 15:58:04 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2018-03-10 09:51:17 +0100 |
commit | 906032d5a04f8cf8af5f515e0a8ea44a2285a2cc (patch) | |
tree | 5fe441daad611e709ca89252b02e0e1fc13b30f9 /Configure | |
parent | 4917e91160fac2acef543ad6a74b2da2e1f17625 (diff) |
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 <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5546)
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 16 |
1 files changed, 6 insertions, 10 deletions
@@ -2135,16 +2135,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}}; } } |