Commit 5cdc23a3 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5546)

(cherry picked from commit 906032d5)
parent 8cd40e1f

Configure

+6 −10
Original line number Diff line number Diff line
@@ -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}};

        }

    }