some missing VMS changes to MakeMaker

Craig, I've just applied the commit below directly to maint.
If appears that when I cherry-picked the 6.49_01 MakeMaker upgrade from
blead, two of the test files didn't get updated. This change means that
maint is now in sync with blead (and CPAN 6.55_01, barring the VMS
whitespace fix), but on the other hand it now represents a last-minute
change to maint. Does it look okay to you?

Thanks.



commit 6d15730bf9394e1de76d052e1763fc6f0982eef1
Author:     David Mitchell <davem@iabyn.com>
AuthorDate: Fri Jul 24 19:27:54 2009 +0100
Commit:     David Mitchell <davem@iabyn.com>
CommitDate: Fri Jul 24 19:27:54 2009 +0100

    Sync Makemaker with blead
    
    The cherry-pick of 1487aac67a72b9f87b24113f65b4d878401bee33
    ("Upgrade to ExtUtils::MakeMaker 6.49_01"), somehow managed to miss
    the changes to INST.t and INST_PREFIX.t


Affected files ...
    
    M	lib/ExtUtils/t/INST.t
    M	lib/ExtUtils/t/INST_PREFIX.t

Differences ...

diff --git a/lib/ExtUtils/t/INST.t b/lib/ExtUtils/t/INST.t
index 2a85f08..49938cb 100644
--- a/lib/ExtUtils/t/INST.t
+++ b/lib/ExtUtils/t/INST.t
@@ -24,8 +24,6 @@ use File::Spec;
 use TieOut;
 use Config;
 
-my $Is_VMS = $^O eq 'VMS';
-
 chdir 't';
 
 perl_lib;
@@ -76,7 +74,6 @@ is( !!$mm->{PERL_CORE}, !!$ENV{PERL_CORE}, 'PERL_CORE' );
 my($perl_src, $mm_perl_src);
 if( $ENV{PERL_CORE} ) {
     $perl_src = File::Spec->catdir($Updir, $Updir);
-    $perl_src = VMS::Filespec::vmsify($perl_src) if $Is_VMS;
     $perl_src = File::Spec->canonpath($perl_src);
     $mm_perl_src = File::Spec->canonpath($mm->{PERL_SRC});
 }
@@ -93,28 +90,22 @@ is( $mm->{PERM_RWX}, 755,    'PERM_RWX' );
 
 
 # INST_*
-my $expect = File::Spec->catdir($Curdir, 'blib', 'arch');
-$expect = VMS::Filespec::vmspath($expect) if $Is_VMS;
 is( $mm->{INST_ARCHLIB}, 
     $mm->{PERL_CORE} ? $mm->{PERL_ARCHLIB}
-                     : $expect,
-                          'INST_ARCHLIB');
-$expect = File::Spec->catdir($Curdir, 'blib', 'bin');
-$expect = VMS::Filespec::vmspath($expect) if $Is_VMS;
-is( $mm->{INST_BIN}, $expect, 'INST_BIN' );
+                     : File::Spec->catdir($Curdir, 'blib', 'arch'),
+                                     'INST_ARCHLIB');
+is( $mm->{INST_BIN},     File::Spec->catdir($Curdir, 'blib', 'bin'),
+                                     'INST_BIN' );
 
 is( keys %{$mm->{CHILDREN}}, 1 );
 my($child_pack) = keys %{$mm->{CHILDREN}};
 my $c_mm = $mm->{CHILDREN}{$child_pack};
-$expect = File::Spec->catdir($Updir, 'blib', 'arch');
-$expect = VMS::Filespec::vmspath($expect) if $Is_VMS;
 is( $c_mm->{INST_ARCHLIB}, 
     $c_mm->{PERL_CORE} ? $c_mm->{PERL_ARCHLIB}
-                       : $expect,
-                             'CHILD INST_ARCHLIB');
-$expect = File::Spec->catdir($Updir, 'blib', 'bin');
-$expect = VMS::Filespec::vmspath($expect) if $Is_VMS;
-is( $c_mm->{INST_BIN}, $expect, 'CHILD INST_BIN' );
+                       : File::Spec->catdir($Updir, 'blib', 'arch'),
+                                     'CHILD INST_ARCHLIB');
+is( $c_mm->{INST_BIN},     File::Spec->catdir($Updir, 'blib', 'bin'),
+                                     'CHILD INST_BIN' );
 
 
 my $inst_lib = File::Spec->catdir($Curdir, 'blib', 'lib');
diff --git a/lib/ExtUtils/t/INST_PREFIX.t b/lib/ExtUtils/t/INST_PREFIX.t
index 1d580dd..57e7eb2 100644
--- a/lib/ExtUtils/t/INST_PREFIX.t
+++ b/lib/ExtUtils/t/INST_PREFIX.t
@@ -103,7 +103,6 @@ is( !!$mm->{PERL_CORE}, !!$ENV{PERL_CORE}, 'PERL_CORE' );
 my($perl_src, $mm_perl_src);
 if( $ENV{PERL_CORE} ) {
     $perl_src = File::Spec->catdir($Updir, $Updir);
-    $perl_src = VMS::Filespec::vmsify($perl_src) if $Is_VMS;
     $perl_src = File::Spec->canonpath($perl_src);
     $mm_perl_src = File::Spec->canonpath($mm->{PERL_SRC});
 }
@@ -154,7 +153,6 @@ while( my($type, $vars) = each %Install_Vars) {
     _set_config(installman3dir => '');
 
     my $wibble = File::Spec->catdir(qw(wibble and such));
-    $wibble = VMS::Filespec::vmspath($wibble) if $Is_VMS;
     my $stdout = tie *STDOUT, 'TieOut' or die;
     my $mm = WriteMakefile(
                            NAME          => 'Big::Dummy',
@@ -189,9 +187,7 @@ while( my($type, $vars) = each %Install_Vars) {
                    INSTALLMAN3DIR=> 'foo/bar/baz',
                   );
 
-    my $expect = File::Spec->catdir('foo','bar');
-    $expect = VMS::Filespec::vmspath($expect) if $Is_VMS;
-    is( $mm->{INSTALLVENDORMAN1DIR}, $expect, 
+    is( $mm->{INSTALLVENDORMAN1DIR}, File::Spec->catdir('foo','bar'), 
                       'installvendorman1dir (in %Config) not modified' );
     isnt( $mm->{INSTALLVENDORMAN3DIR}, '', 
                       'installvendorman3dir (not in %Config) set'  );
@@ -216,14 +212,9 @@ while( my($type, $vars) = each %Install_Vars) {
                            VERSION_FROM  => 'lib/Big/Dummy.pm',
                            PERL_CORE     => $ENV{PERL_CORE},
                           );
-    my $expect1 = File::Spec->catdir('foo', 'bar');
-    my $expect2 = File::Spec->catdir('foo', 'baz');
-    if ($Is_VMS) {
-        $expect1 = VMS::Filespec::vmspath($expect1);
-        $expect2 = VMS::Filespec::vmspath($expect2);
-    }
-    is( $mm->{INSTALLMAN1DIR}, $expect1 );
-    is( $mm->{INSTALLMAN3DIR}, $expect2 );
+
+    is( $mm->{INSTALLMAN1DIR}, File::Spec->catdir('foo', 'bar') );
+    is( $mm->{INSTALLMAN3DIR}, File::Spec->catdir('foo', 'baz') );
     SKIP: {
         skip "VMS must expand macros in INSTALL* vars", 4 if $Is_VMS;
 
@@ -255,14 +246,8 @@ while( my($type, $vars) = each %Install_Vars) {
                            PERL_CORE     => $ENV{PERL_CORE},
                           );
 
-    my $expect1 = File::Spec->catdir('foo', 'bar');
-    my $expect2 = File::Spec->catdir('foo', 'baz');
-    if ($Is_VMS) {
-        $expect1 = VMS::Filespec::vmspath($expect1);
-        $expect2 = VMS::Filespec::vmspath($expect2);
-    }
-    is( $mm->{INSTALLMAN1DIR}, $expect1 );
-    is( $mm->{INSTALLMAN3DIR}, $expect2 );
+    is( $mm->{INSTALLMAN1DIR}, File::Spec->catdir('foo', 'bar') );
+    is( $mm->{INSTALLMAN3DIR}, File::Spec->catdir('foo', 'baz') );
     SKIP: {
         skip "VMS must expand macros in INSTALL* vars", 2 if $Is_VMS;
         is( $mm->{INSTALLSITEMAN1DIR},   '$(INSTALLMAN1DIR)' );

-- 
"Strange women lying in ponds distributing swords is no basis for a system
of government. Supreme executive power derives from a mandate from the
masses, not from some farcical aquatic ceremony."
    -- Dennis, "Monty Python and the Holy Grail"

• some missing VMS changes to MakeMaker by Dave Mitchell
• Re: some missing VMS changes to MakeMaker by Craig A. Berry