Replace File::Spec->cat{dir,file} with $self->same.

This reverts f5fe6a4 but there are too many conflicts to
do a simple git revert.  There was no rationale in the commit
message, so it appears to have been a cosmetic change, but it
breaks several targets on VMS.

As a grep of the sources for "sub catdir" or "sub catfile" would
have shown, the local versions are not always the same as the
File::Spec versions.

Specifically, because the parentheses in filenames are only legal
on VMS if they have been escaped, and path concatenation does this
escaping, macros must be expanded before path concatenation to
avoid getting nonsense paths such as [."$"^(INST_LIB^).auto].

That's what the local versions of catdir and catfile do on VMS and
why we have them in the first place (and have had in some form for
a couple of decades).  Other platforms will get the File::Spec
functions via inheritance as designed.

Author: craigberry

lib/ExtUtils/MM_Unix.pm

@@ -467,7 +467,7 @@ MAN3PODS = ".$self->wraplist(sort keys %{$self->{MAN3PODS}})."
     push @m, q{
 # Where is the Config information that we are using/depend on
 CONFIGDEP = $(PERL_ARCHLIBDEP)$(DFSEP)Config.pm $(PERL_INCDEP)$(DFSEP)config.h
-} if -e File::Spec->catfile( $self->{PERL_INC}, 'config.h' );
+} if -e $self->catfile( $self->{PERL_INC}, 'config.h' );
 
 
     push @m, qq{
@@ -899,9 +899,9 @@ sub _xs_make_bs {
     my ($v, $d, $f) = File::Spec->splitpath($basename);
     my @d = File::Spec->splitdir($d);
     shift @d if $self->{XSMULTI} and $d[0] eq 'lib';
-    my $instdir = File::Spec->catdir('$(INST_ARCHLIB)', 'auto', @d, $f);
+    my $instdir = $self->catdir('$(INST_ARCHLIB)', 'auto', @d, $f);
     $instdir = '$(INST_ARCHAUTODIR)' if $basename eq '$(BASEEXT)';
-    my $instfile = File::Spec->catfile($instdir, "$f.bs");
+    my $instfile = $self->catfile($instdir, "$f.bs");
     my $exists = "$instdir\$(DFSEP).exists"; # match blibdirs_target
     #                                 1          2          3
     return _sprintf562 <<'MAKE_FRAG', $basename, $instfile, $exists;
@@ -940,8 +940,8 @@ sub dynamic_lib {
             my ($v, $d, $f) = File::Spec->splitpath($ext);
             my @d = File::Spec->splitdir($d);
             shift @d if $d[0] eq 'lib';
-            my $instdir = File::Spec->catdir('$(INST_ARCHLIB)', 'auto', @d, $f);
-            my $instfile = File::Spec->catfile($instdir, "$f.\$(DLEXT)");
+            my $instdir = $self->catdir('$(INST_ARCHLIB)', 'auto', @d, $f);
+            my $instfile = $self->catfile($instdir, "$f.\$(DLEXT)");
             my $objfile = $self->_xsbuild_value('xs', $ext, 'OBJECT');
             $objfile = "$ext\$(OBJ_EXT)" unless defined $objfile;
             my $ldfrom = $self->_xsbuild_value('xs', $ext, 'LDFROM');
@@ -1252,7 +1252,7 @@ sub _fixin_replace_shebang {
         $interpreter = '';
 
         foreach my $dir (@absdirs) {
-            my $maybefile = File::Spec->catfile($dir,$cmd);
+            my $maybefile = $self->catfile($dir,$cmd);
             if ( $self->maybe_command($maybefile) ) {
                 warn "Ignoring $interpreter in $file\n"
                     if $Verbose && $interpreter;
@@ -1377,7 +1377,7 @@ sub init_dirscan {	# --- File and Directory Lists (.xs .pm .pod etc)
 	if (-d $name){
 	    next if -l $name; # We do not support symlinks at all
             next if $self->{NORECURS};
-	    $dir{$name} = $name if (-f File::Spec->catfile($name,"Makefile.PL"));
+	    $dir{$name} = $name if (-f $self->catfile($name,"Makefile.PL"));
 	} elsif ($name =~ /\.xs\z/){
 	    my($c); ($c = $name) =~ s/\.xs\z/.c/;
 	    $xs{$name} = $c;
@@ -1397,10 +1397,10 @@ sub init_dirscan {	# --- File and Directory Lists (.xs .pm .pod etc)
 		($pl_files{$name} = $name) =~ s/[._]pl\z//i ;
 	    }
 	    else {
-                $pm{$name} = File::Spec->catfile($self->{INST_LIBDIR},$name);
+                $pm{$name} = $self->catfile($self->{INST_LIBDIR},$name);
             }
 	} elsif ($name =~ /\.(p[ml]|pod)\z/){
-	    $pm{$name} = File::Spec->catfile($self->{INST_LIBDIR},$name);
+	    $pm{$name} = $self->catfile($self->{INST_LIBDIR},$name);
 	}
     }
 
@@ -1477,7 +1477,7 @@ sub init_MAN1PODS {
 	    next unless $self->_has_pod($name);
 
 	    $self->{MAN1PODS}->{$name} =
-		File::Spec->catfile("\$(INST_MAN1DIR)",
+		$self->catfile("\$(INST_MAN1DIR)",
 			       basename($name).".\$(MAN1EXT)");
 	}
     }
@@ -1523,13 +1523,13 @@ sub init_MAN3PODS {
 	$manpagename =~ s/\.p(od|m|l)\z//;
 	# everything below lib is ok
 	unless($manpagename =~ s!^\W*($parentlibs_re)\W+!!s) {
-	    $manpagename = File::Spec->catfile(
+	    $manpagename = $self->catfile(
 	        split(/::/,$self->{PARENT_NAME}),$manpagename
 	    );
 	}
 	$manpagename = $self->replace_manpage_separator($manpagename);
 	$self->{MAN3PODS}->{$name} =
-	    File::Spec->catfile("\$(INST_MAN3DIR)", "$manpagename.\$(MAN3EXT)");
+	    $self->catfile("\$(INST_MAN3DIR)", "$manpagename.\$(MAN3EXT)");
     }
 }
 
@@ -1621,7 +1621,7 @@ sub init_PM {
                 if ($striplibpath = $path) =~ s{^(\W*)($parentlibs_re)\W}
 	                                       {$1}i;
 
-	    my($inst) = File::Spec->catfile($prefix,$striplibpath);
+	    my($inst) = $self->catfile($prefix,$striplibpath);
 	    local($_) = $inst; # for backwards compatibility
 	    $inst = $self->libscan($inst);
 	    print "libscan($path) => '$inst'\n" if ($Verbose >= 2);
@@ -1675,7 +1675,7 @@ sub init_main {
 ### Only UNIX:
 ###    ($self->{FULLEXT} =
 ###     $self->{NAME}) =~ s!::!/!g ; #eg. BSD/Foo/Socket
-    $self->{FULLEXT} = File::Spec->catdir(split /::/, $self->{NAME});
+    $self->{FULLEXT} = $self->catdir(split /::/, $self->{NAME});
 
 
     # Copied from DynaLoader:
@@ -1711,11 +1711,11 @@ sub init_main {
 
     unless ($self->{PERL_SRC}){
         foreach my $dir_count (1..8) { # 8 is the VMS limit for nesting
-            my $dir = File::Spec->catdir(($Updir) x $dir_count);
+            my $dir = $self->catdir(($Updir) x $dir_count);
 
-            if (-f File::Spec->catfile($dir,"config_h.SH")   &&
-                -f File::Spec->catfile($dir,"perl.h")        &&
-                -f File::Spec->catfile($dir,"lib","strict.pm")
+            if (-f $self->catfile($dir,"config_h.SH")   &&
+                -f $self->catfile($dir,"perl.h")        &&
+                -f $self->catfile($dir,"lib","strict.pm")
             ) {
                 $self->{PERL_SRC}=$dir ;
                 last;
@@ -1727,19 +1727,19 @@ sub init_main {
       $self->{PERL_CORE} and !$self->{PERL_SRC};
 
     if ($self->{PERL_SRC}){
-	$self->{PERL_LIB}     ||= File::Spec->catdir("$self->{PERL_SRC}","lib");
+	$self->{PERL_LIB}     ||= $self->catdir("$self->{PERL_SRC}","lib");
 
         $self->{PERL_ARCHLIB} = $self->{PERL_LIB};
         $self->{PERL_INC}     = ($Is{Win32}) ?
-            File::Spec->catdir($self->{PERL_LIB},"CORE") : $self->{PERL_SRC};
+            $self->catdir($self->{PERL_LIB},"CORE") : $self->{PERL_SRC};
 
 	# catch a situation that has occurred a few times in the past:
 	unless (
-		-s File::Spec->catfile($self->{PERL_SRC},'cflags')
+		-s $self->catfile($self->{PERL_SRC},'cflags')
 		or
 		$Is{VMS}
 		&&
-		-s File::Spec->catfile($self->{PERL_SRC},'vmsish.h')
+		-s $self->catfile($self->{PERL_SRC},'vmsish.h')
 		or
 		$Is{Win32}
 	       ){
@@ -1762,23 +1762,23 @@ from the perl source tree.
         my $old = $self->{PERL_LIB} || $self->{PERL_ARCHLIB} || $self->{PERL_INC};
 	$self->{PERL_LIB}     ||= $Config{privlibexp};
 	$self->{PERL_ARCHLIB} ||= $Config{archlibexp};
-	$self->{PERL_INC}     = File::Spec->catdir("$self->{PERL_ARCHLIB}","CORE"); # wild guess for now
+	$self->{PERL_INC}     = $self->catdir("$self->{PERL_ARCHLIB}","CORE"); # wild guess for now
 	my $perl_h;
 
-	if (not -f ($perl_h = File::Spec->catfile($self->{PERL_INC},"perl.h"))
+	if (not -f ($perl_h = $self->catfile($self->{PERL_INC},"perl.h"))
 	    and not $old){
 	    # Maybe somebody tries to build an extension with an
 	    # uninstalled Perl outside of Perl build tree
 	    my $lib;
 	    for my $dir (@INC) {
-	      $lib = $dir, last if -e File::Spec->catfile($dir, "Config.pm");
+	      $lib = $dir, last if -e $self->catfile($dir, "Config.pm");
 	    }
 	    if ($lib) {
               # Win32 puts its header files in /perl/src/lib/CORE.
               # Unix leaves them in /perl/src.
-	      my $inc = $Is{Win32} ? File::Spec->catdir($lib, "CORE" )
+	      my $inc = $Is{Win32} ? $self->catdir($lib, "CORE" )
                                   : dirname $lib;
-	      if (-e File::Spec->catfile($inc, "perl.h")) {
+	      if (-e $self->catfile($inc, "perl.h")) {
 		$self->{PERL_LIB}	   = $lib;
 		$self->{PERL_ARCHLIB}	   = $lib;
 		$self->{PERL_INC}	   = $inc;
@@ -1849,7 +1849,7 @@ EOP
     # make a simple check if we find strict
     warn "Warning: PERL_LIB ($self->{PERL_LIB}) seems not to be a perl library directory
         (strict.pm not found)"
-        unless -f File::Spec->catfile("$self->{PERL_LIB}","strict.pm") ||
+        unless -f $self->catfile("$self->{PERL_LIB}","strict.pm") ||
                $self->{NAME} eq "ExtUtils::MakeMaker";
 }
 
@@ -2145,20 +2145,20 @@ sub init_xs {
 
     if ($self->has_link_code()) {
         $self->{INST_STATIC}  =
-          File::Spec->catfile('$(INST_ARCHAUTODIR)', '$(BASEEXT)$(LIB_EXT)');
+          $self->catfile('$(INST_ARCHAUTODIR)', '$(BASEEXT)$(LIB_EXT)');
         $self->{INST_DYNAMIC} =
-          File::Spec->catfile('$(INST_ARCHAUTODIR)', '$(DLBASE).$(DLEXT)');
+          $self->catfile('$(INST_ARCHAUTODIR)', '$(DLBASE).$(DLEXT)');
         $self->{INST_BOOT}    =
-          File::Spec->catfile('$(INST_ARCHAUTODIR)', '$(BASEEXT).bs');
+          $self->catfile('$(INST_ARCHAUTODIR)', '$(BASEEXT).bs');
 	if ($self->{XSMULTI}) {
 	    my @exts = $self->_xs_list_basenames;
 	    my (@statics, @dynamics, @boots);
 	    for my $ext (@exts) {
 		my ($v, $d, $f) = File::Spec->splitpath($ext);
 		my @d = File::Spec->splitdir($d);
 		shift @d if defined $d[0] and $d[0] eq 'lib';
-		my $instdir = File::Spec->catdir('$(INST_ARCHLIB)', 'auto', @d, $f);
-		my $instfile = File::Spec->catfile($instdir, $f);
+		my $instdir = $self->catdir('$(INST_ARCHLIB)', 'auto', @d, $f);
+		my $instfile = $self->catfile($instdir, $f);
 		push @statics, "$instfile\$(LIB_EXT)";
 		push @dynamics, "$instfile.\$(DLEXT)";
 		push @boots, "$instfile.bs";
@@ -2214,8 +2214,8 @@ pure_perl_install :: all
 };
 
     push @m,
-q{		read "}.File::Spec->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \
-		write "}.File::Spec->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \
+q{		read "}.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \
+		write "}.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \
 } unless $self->{NO_PACKLIST};
 
     push @m,
@@ -2226,15 +2226,15 @@ q{		"$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
 		"$(INST_MAN1DIR)" "$(DESTINSTALLMAN1DIR)" \
 		"$(INST_MAN3DIR)" "$(DESTINSTALLMAN3DIR)"
 	$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
-		"}.File::Spec->catdir('$(SITEARCHEXP)','auto','$(FULLEXT)').q{"
+		"}.$self->catdir('$(SITEARCHEXP)','auto','$(FULLEXT)').q{"
 
 
 pure_site_install :: all
 	$(NOECHO) $(MOD_INSTALL) \
 };
     push @m,
-q{		read "}.File::Spec->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
-		write "}.File::Spec->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{" \
+q{		read "}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
+		write "}.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{" \
 } unless $self->{NO_PACKLIST};
 
     push @m,
@@ -2245,14 +2245,14 @@ q{		"$(INST_LIB)" "$(DESTINSTALLSITELIB)" \
 		"$(INST_MAN1DIR)" "$(DESTINSTALLSITEMAN1DIR)" \
 		"$(INST_MAN3DIR)" "$(DESTINSTALLSITEMAN3DIR)"
 	$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
-		"}.File::Spec->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{"
+		"}.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{"
 
 pure_vendor_install :: all
 	$(NOECHO) $(MOD_INSTALL) \
 };
     push @m,
-q{		read "}.File::Spec->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
-		write "}.File::Spec->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{" \
+q{		read "}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
+		write "}.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{" \
 } unless $self->{NO_PACKLIST};
 
     push @m,
@@ -2287,7 +2287,7 @@ doc_perl_install :: all
 		LINKTYPE "$(LINKTYPE)" \
 		VERSION "$(VERSION)" \
 		EXE_FILES "$(EXE_FILES)" \
-		>> "}.File::Spec->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
+		>> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
 
 doc_site_install :: all
 	$(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
@@ -2298,7 +2298,7 @@ doc_site_install :: all
 		LINKTYPE "$(LINKTYPE)" \
 		VERSION "$(VERSION)" \
 		EXE_FILES "$(EXE_FILES)" \
-		>> "}.File::Spec->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
+		>> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
 
 doc_vendor_install :: all
 	$(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod"
@@ -2309,7 +2309,7 @@ doc_vendor_install :: all
 		LINKTYPE "$(LINKTYPE)" \
 		VERSION "$(VERSION)" \
 		EXE_FILES "$(EXE_FILES)" \
-		>> "}.File::Spec->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
+		>> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
 
 } unless $self->{NO_PERLLOCAL};
 
@@ -2318,13 +2318,13 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
 	$(NOECHO) $(NOOP)
 
 uninstall_from_perldirs ::
-	$(NOECHO) $(UNINSTALL) "}.File::Spec->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{"
+	$(NOECHO) $(UNINSTALL) "}.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{"
 
 uninstall_from_sitedirs ::
-	$(NOECHO) $(UNINSTALL) "}.File::Spec->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{"
+	$(NOECHO) $(UNINSTALL) "}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{"
 
 uninstall_from_vendordirs ::
-	$(NOECHO) $(UNINSTALL) "}.File::Spec->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{"
+	$(NOECHO) $(UNINSTALL) "}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{"
 };
 
     join("",@m);
@@ -2347,7 +2347,7 @@ sub installbin {
 
     my %fromto;
     for my $from (@exefiles) {
-	my($path)= File::Spec->catfile('$(INST_SCRIPT)', basename($from));
+	my($path)= $self->catfile('$(INST_SCRIPT)', basename($from));
 
 	local($_) = $path; # for backwards compatibility
 	my $to = $self->libscan($path);
@@ -2680,15 +2680,15 @@ doc_inst_perl :
 		MAP_STATIC "$(MAP_STATIC)" \
 		MAP_EXTRA "`cat $(INST_ARCHAUTODIR)/extralibs.all`" \
 		MAP_LIBPERL "$(MAP_LIBPERL)" \
-		>> "}.File::Spec->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
+		>> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
 
 };
 
     push @m, q{
 inst_perl : pure_inst_perl doc_inst_perl
 
 pure_inst_perl : $(MAP_TARGET)
-	}.$self->{CP}.q{ $(MAP_TARGET) "}.File::Spec->catfile('$(DESTINSTALLBIN)','$(MAP_TARGET)').q{"
+	}.$self->{CP}.q{ $(MAP_TARGET) "}.$self->catfile('$(DESTINSTALLBIN)','$(MAP_TARGET)').q{"
 
 clean :: map_clean
 
@@ -3020,7 +3020,7 @@ destination and autosplits them. See L<ExtUtils::Install/DESCRIPTION>
 
 sub pm_to_blib {
     my $self = shift;
-    my($autodir) = File::Spec->catdir('$(INST_LIB)','auto');
+    my($autodir) = $self->catdir('$(INST_LIB)','auto');
     my $r = q{
 pm_to_blib : $(FIRST_MAKEFILE) $(TO_INST_PM)
 };
@@ -3197,7 +3197,7 @@ sub prefixify {
         warn "    cannot prefix, using default.\n" if $Verbose >= 2;
         warn "    no default!\n" if !$default && $Verbose >= 2;
 
-        $path = File::Spec->catdir($rprefix, $default) if $default;
+        $path = $self->catdir($rprefix, $default) if $default;
     }
 
     print "    now $path\n" if $Verbose >= 2;
@@ -3530,7 +3530,7 @@ sub staticmake {
     # And as it's not yet built, we add the current extension
     # but only if it has some C code (or XS code, which implies C code)
     if (@{$self->{C}}) {
-	@static = File::Spec->catfile($self->{INST_ARCHLIB},
+	@static = $self->catfile($self->{INST_ARCHLIB},
 				 "auto",
 				 $self->{FULLEXT},
 				 "$self->{BASEEXT}$self->{LIB_EXT}"
@@ -3729,16 +3729,16 @@ sub tool_xsubpp {
 
     my $foundxsubpp = 0;
     foreach my $dir (@xsubpp_dirs) {
-        $xsdir = File::Spec->catdir($dir, 'ExtUtils');
-        if( -r File::Spec->catfile($xsdir, "xsubpp") ) {
+        $xsdir = $self->catdir($dir, 'ExtUtils');
+        if( -r $self->catfile($xsdir, "xsubpp") ) {
             $foundxsubpp = 1;
             last;
         }
     }
     die "ExtUtils::MM_Unix::tool_xsubpp : Can't find xsubpp" if !$foundxsubpp;
 
-    my $tmdir   = File::Spec->catdir($self->{PERL_LIB},"ExtUtils");
-    my(@tmdeps) = File::Spec->catfile($tmdir,'typemap');
+    my $tmdir   = $self->catdir($self->{PERL_LIB},"ExtUtils");
+    my(@tmdeps) = $self->catfile($tmdir,'typemap');
     if( $self->{TYPEMAPS} ){
         foreach my $typemap (@{$self->{TYPEMAPS}}){
             if( ! -f  $typemap ) {