Change 20527 by [EMAIL PROTECTED] on 2003/08/06 14:57:22
More PASTHRU patching from Steve Hay.
Affected files ...
... //depot/perl/lib/ExtUtils/MM_Unix.pm#187 edit
Differences ...
==== //depot/perl/lib/ExtUtils/MM_Unix.pm#187 (text) ====
Index: perl/lib/ExtUtils/MM_Unix.pm
--- perl/lib/ExtUtils/MM_Unix.pm#186~20520~ Wed Aug 6 04:38:46 2003
+++ perl/lib/ExtUtils/MM_Unix.pm Wed Aug 6 07:57:22 2003
@@ -3112,18 +3112,19 @@
$sep .= "\\\n\t";
foreach $key (qw(LIB LIBPERL_A LINKTYPE PREFIX OPTIMIZE INC DEFINE)) {
- if ($key eq 'INC' && defined(my $inc = $self->{INC})) {
+ next unless defined $self->{$key};
+ if ($key eq 'INC') {
# For INC we need to prepend parent directory but
# only iff the parent directory is not absolute.
my ($o, $i) = $Is_VMS ? ('/Include=', 'i') : ('-I', '');
- my $newinc = '';
- foreach (grep { /\S/ } parse_line(qr/\s*(?$i)$o/, 1, $inc)) {
- s/^"(.+)"$/$1/o;
+ my $inc = '';
+ foreach (grep { /\S/ } parse_line(qr/\s*(?$i)$o/, 1, $self->{INC})) {
+ s/^"(.+)"\s*$/$1/o;
my $dir = File::Spec->file_name_is_absolute($_) ? $_ :
File::Spec->catdir(File::Spec->updir, $_);
$dir = qq["$dir"] if $dir =~ / /;
- $newinc .= " $o$dir";
+ $inc .= " $o$dir";
}
- push @pasthru, "INC=\"$newinc\"";
+ push @pasthru, "INC=\"$inc\"";
} else {
push @pasthru, "$key=\"\$($key)\"";
}
End of Patch.
