diff options
| author | Craig A. Berry <craigberry@mac.com> | 2006-01-13 01:12:44 +0000 |
|---|---|---|
| committer | Craig A. Berry <craigberry@mac.com> | 2006-01-13 01:12:44 +0000 |
| commit | 1dd9167a996be5f22bc74d6a8c46a12917e4817f (patch) | |
| tree | bf6999933b7e828fc74c5b2c73c94763be1258bd /lib/ExtUtils | |
| parent | 90851df92fb26217b0f1c0286baca234cc285e52 (diff) | |
| download | perl-1dd9167a996be5f22bc74d6a8c46a12917e4817f.tar.gz | |
Assorted VMS-only MakeMaker fixes for blead
p4raw-id: //depot/perl@26813
Diffstat (limited to 'lib/ExtUtils')
| -rw-r--r-- | lib/ExtUtils/MM_Unix.pm | 4 | ||||
| -rw-r--r-- | lib/ExtUtils/MM_VMS.pm | 14 | ||||
| -rw-r--r-- | lib/ExtUtils/t/FIRST_MAKEFILE.t | 2 | ||||
| -rw-r--r-- | lib/ExtUtils/t/basic.t | 3 |
4 files changed, 18 insertions, 5 deletions
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm index 46a55f40be..2df687f595 100644 --- a/lib/ExtUtils/MM_Unix.pm +++ b/lib/ExtUtils/MM_Unix.pm @@ -3042,8 +3042,8 @@ sub processPL { foreach my $target (@$list) { if( $Is_VMS ) { - $plfile = vmsify($plfile); - $target = vmsify($target); + $plfile = vmsify($self->eliminate_macros($plfile)); + $target = vmsify($self->eliminate_macros($target)); } # Normally a .PL file runs AFTER pm_to_blib so it can have diff --git a/lib/ExtUtils/MM_VMS.pm b/lib/ExtUtils/MM_VMS.pm index e2f3f77725..cb3efadabc 100644 --- a/lib/ExtUtils/MM_VMS.pm +++ b/lib/ExtUtils/MM_VMS.pm @@ -447,10 +447,20 @@ sub init_others { $self->{NOOP} = 'Continue'; $self->{NOECHO} ||= '@ '; - $self->{MAKEFILE} ||= 'Descrip.MMS'; + $self->{MAKEFILE} ||= $self->{FIRST_MAKEFILE} || 'Descrip.MMS'; $self->{FIRST_MAKEFILE} ||= $self->{MAKEFILE}; $self->{MAKE_APERL_FILE} ||= 'Makeaperl.MMS'; - $self->{MAKEFILE_OLD} ||= '$(FIRST_MAKEFILE)_old'; + $self->{MAKEFILE_OLD} ||= $self->eliminate_macros('$(FIRST_MAKEFILE)_old'); +# +# If an extension is not specified, then MMS/MMK assumes an +# an extension of .MMS. If there really is no extension, +# then a trailing "." needs to be appended to specify a +# a null extension. +# + $self->{MAKEFILE} .= '.' unless $self->{MAKEFILE} =~ m/\./; + $self->{FIRST_MAKEFILE} .= '.' unless $self->{FIRST_MAKEFILE} =~ m/\./; + $self->{MAKE_APERL_FILE} .= '.' unless $self->{MAKE_APERL_FILE} =~ m/\./; + $self->{MAKEFILE_OLD} .= '.' unless $self->{MAKEFILE_OLD} =~ m/\./; $self->{MACROSTART} ||= '/Macro=('; $self->{MACROEND} ||= ')'; diff --git a/lib/ExtUtils/t/FIRST_MAKEFILE.t b/lib/ExtUtils/t/FIRST_MAKEFILE.t index 731dd34d92..00e6082403 100644 --- a/lib/ExtUtils/t/FIRST_MAKEFILE.t +++ b/lib/ExtUtils/t/FIRST_MAKEFILE.t @@ -36,5 +36,5 @@ cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || diag @mpl_out; ok( -e 'jakefile', 'FIRST_MAKEFILE honored' ); -ok( grep(/^Writing jakefile for Big::Dummy/, @mpl_out) == 1, +ok( grep(/^Writing jakefile(?:\.)? for Big::Dummy/, @mpl_out) == 1, 'Makefile.PL output looks right' ); diff --git a/lib/ExtUtils/t/basic.t b/lib/ExtUtils/t/basic.t index cf6701c8e1..2788b6eaf9 100644 --- a/lib/ExtUtils/t/basic.t +++ b/lib/ExtUtils/t/basic.t @@ -30,6 +30,9 @@ delete @ENV{qw(PREFIX LIB MAKEFLAGS MAKE_JOBS_FIFO)}; my $perl = which_perl(); my $Is_VMS = $^O eq 'VMS'; +# GNV logical interferes with testing +$ENV{'bin'} = '[.bin]' if $Is_VMS; + chdir 't'; perl_lib; |