In perl.git, the branch smoke-me/yves-hv_h_split has been updated <http://perl5.git.perl.org/perl.git/commitdiff/2bcbb0bc084fcf77766f45b755aa37b9e2092889?hp=0b340fe025421621146aac814778d80ad1df28c2>
- Log ----------------------------------------------------------------- commit 2bcbb0bc084fcf77766f45b755aa37b9e2092889 Author: Craig A. Berry <[email protected]> Date: Wed Feb 20 22:17:47 2013 -0600 Don't need completely different include file collector on VMS. We just need to skipping putting a Unix delimiter between the directory and the filename. M cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm commit bc9c3e1683cdcbacfb3e73bbbf0c11970abeb918 Author: Craig A. Berry <[email protected]> Date: Thu Feb 21 13:01:55 2013 -0600 Remove spurious backslash. M cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm ----------------------------------------------------------------------- Summary of changes: cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 2 +- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm | 22 +++++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm index db1342f..9e519fd 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm @@ -2755,7 +2755,7 @@ MAKE_FRAG return join "", @m unless $self->needs_linking; if ($self->{OBJECT}) { - my $fmt= ' \$(PERL_INC)/%s '; # preserve the old indentation and formating + my $fmt= ' $(PERL_INC)/%s '; # preserve the old indentation and formating push @m, qq{PERL_HDRS = \\\n} . join("\\\n", map { sprintf $fmt, $_ } $self->_perl_header_files()) . qq{\n\n\$(OBJECT) : \$(PERL_HDRS)\n}; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm index 4602b1d..ebaa9dc 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm @@ -1288,21 +1288,13 @@ sub perldepend { my($self) = @_; my(@m); - if ( $self->{OBJECT} ) { - # This block is structured so as to try hard to keep lines under 80 chars - # I do not know if that is required or not, but that is how the code this - # replaced looked, and since I can't test directly, seemed a reasonable - # property to preserve in this refactoring. - my @lines; - foreach my $file ( $self->_perl_header_files() ) { - my $cat = ", \$(PERL_INC)$file"; - if (!@lines or length($lines[-1] . $cat) > 79) { - push @lines, "\$(OBJECT) : \$(PERL_INC)$file"; - } else { - $lines[-1] .= $cat; - } - } - push @m, join("\n", "", @lines, "", ""); # "" are to add blank lines in appropriate places +# This is the same as what's done in MM_Unix except we don't put '/' between +# the directory and the filename as the directory already has delimiters. + if ($self->{OBJECT}) { + my $fmt= ' $(PERL_INC)%s '; + push @m, qq{PERL_HDRS = \\\n} + . join("\\\n", map { sprintf $fmt, $_ } $self->_perl_header_files()) + . qq{\n\n\$(OBJECT) : \$(PERL_HDRS)\n}; } if ($self->{PERL_SRC}) { -- Perl5 Master Repository
