In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/71faf10a29dcbf55255bd39e6d95e5abbe97958b?hp=d648ffcb179b885089e064ec1d58c60027c80915>
- Log ----------------------------------------------------------------- commit 71faf10a29dcbf55255bd39e6d95e5abbe97958b Author: Chris 'BinGOs' Williams <[email protected]> Date: Tue Nov 25 12:00:26 2014 +0000 Treat nmake the same as dmake (expand 6544e9b1a) Already applied upstream ----------------------------------------------------------------------- Summary of changes: cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm | 2 +- t/porting/customized.dat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm index 96edfa6..6c3ce50 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm @@ -206,7 +206,7 @@ sub is_make_type { my($self, $type) = @_; (undef, undef, my $make_basename) = $self->splitpath($self->make); return 1 if $make_basename =~ /\b$type\b/i; # executable's filename - return 0 if $make_basename =~ /\bdmake\b/i; # Never fall through for dmake + return 0 if $make_basename =~ /\b(dmake|nmake)\b/i; # Never fall through for dmake/nmake # now have to run with "-v" and guess my $redirect = $self->can_redirect_error ? '2>&1' : ''; my $make = $self->make || $self->{MAKE}; diff --git a/t/porting/customized.dat b/t/porting/customized.dat index 4f7f35f..508e693 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -1,7 +1,7 @@ DB_File cpan/DB_File/DB_File.xs f364b661bbb0df075b0c425b104577e7176fe82b Digest::MD5 cpan/Digest-MD5/t/files.t bdbe05b705d9da305fedce7a9f4b6ba63250c7cf Encode cpan/Encode/encoding.pm 506ec84f1fbbff189c3f4f47b92aff5afc95b98e -ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 5ff15de1269f618d8e3b22626568ea97d596de77 +ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm 2590c841d9131bcc86549050aa4a270d5ffa2b6a ExtUtils::MakeMaker cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm 793813932194c12e62c6046f62ea6f1fb65de80b IO::Socket::IP cpan/IO-Socket-IP/t/22timeout.t 0a65d4ca44663f70eea3c7f1ccb5faed2940611f PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t ca39f0146e89de02c746e199c45dcb3e5edad691 -- Perl5 Master Repository
