X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/021db424163d574093ff658e9606a6f31942189d..9b49dc400d59e69f15e3fb678ee168366d322633:/installperl

diff --git a/installperl b/installperl
index 0f7e6eb..4dbec21 100755
--- a/installperl
+++ b/installperl
@@ -1,49 +1,25 @@
-#!./perl
+#!./perl -w
 
 BEGIN {
     require 5.004;
     chdir '..' if !-d 'lib' and -d '../lib';
     @INC = 'lib';
     $ENV{PERL5LIB} = 'lib';
-}
 
-BEGIN {
-    use Config;
-    if ($Config{userelocatableinc}) {
-	# This might be a considered a hack. Need to get information about the
-	# configuration from Config.pm *before* Config.pm expands any .../
-	# prefixes.
-	#
-	# So we set $^X to pretend that we're the already installed perl, so
-	# Config.pm doesits ... expansion off that location.
-
-	my $location = $Config{initialinstalllocation};
-	die <<'OS' unless defined $location;
-$Config{initialinstalllocation} is not defined - can't install a relocatable
-perl without this.
-OS
-	$^X = "$location/perl";
-	# And then remove all trace of ever having loaded Config.pm, so that
-	# it will reload with the revised $^X
-	undef %Config::;
-	delete $INC{"Config.pm"};
-	delete $INC{"Config_heavy.pl"};
-	# You never saw us. We weren't here.
-    }
+    # This needs to be at BEGIN time, before any use of Config
+    require './install_lib.pl';
 }
 
 use strict;
-my ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $Is_Darwin,
-    $nonono, $dostrip, $versiononly, $silent, $verbose, $force,
-    $otherperls, $archname, $Is_NetWare, $nwinstall, $nopods);
+use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $Is_Darwin $Is_NetWare
+	    %opts $packlist);
+my ($dostrip, $versiononly, $force,
+    $otherperls, $archname, $nwinstall, $nopods);
+# Not sure how easy it would be to refactor to remove the need for local $depth
+# below
 use vars qw /$depth/;
 
 BEGIN {
-    $Is_VMS = $^O eq 'VMS';
-    $Is_W32 = $^O eq 'MSWin32';
-    $Is_OS2 = $^O eq 'os2';
-    $Is_Cygwin = $^O eq 'cygwin';
-    $Is_Darwin = $^O eq 'darwin';
     if ($Is_VMS) { eval 'use VMS::Filespec;' }
 }
 
@@ -54,14 +30,8 @@ use File::Compare;
 use File::Copy ();
 use File::Path ();
 use ExtUtils::Packlist;
-use Config;
-use subs qw(unlink link chmod);
+use Cwd;
 
-if ($Config{d_umask}) {
-    umask(022); # umasks like 077 aren't that useful for installations
-}
-
-$Is_NetWare = $Config{osname} eq 'NetWare';
 if ($Is_NetWare) {
     $Is_W32 = 0;
     $scr_ext = '.pl';
@@ -69,13 +39,13 @@ if ($Is_NetWare) {
 
 # override the ones in the rest of the script
 sub mkpath {
-    File::Path::mkpath(@_) unless $nonono;
+    File::Path::mkpath(@_) unless $opts{notify};
 }
 
 my $mainperldir = "/usr/bin";
 my $exe_ext = $Config{exe_ext};
 
-# Allow ``make install PERLNAME=something_besides_perl'':
+# Allow "make install PERLNAME=something_besides_perl":
 my $perl = defined($ENV{PERLNAME}) ? $ENV{PERLNAME} : 'perl';
 
 # This is the base used for versioned names, like "perl5.6.0".
@@ -97,20 +67,26 @@ if ( $Is_VMS ) {
 }
 
 $otherperls = 1;
-my $destdir = '';
+# This little hack simplifies making the code after the comment "Fetch some
+# frequently-used items from %Config" warning free. With $opts{destdir} always
+# defined, it's also possible to make the s/\Q$opts{destdir}\E unconditional.
+
+$opts{destdir} = '';
+# Consider refactoring this to use Getopt::Long once Getopt::Long's planned
+# feature is implemented, to distinguish + and - options.
 while (@ARGV) {
-    $nonono = 1 if $ARGV[0] eq '-n';
+    $opts{notify} = 1 if $ARGV[0] eq '-n';
     $dostrip = 1 if $ARGV[0] eq '-s';
     $versiononly = 1 if $ARGV[0] eq '-v';
     $versiononly = 0 if $ARGV[0] eq '+v';
-    $silent = 1 if $ARGV[0] eq '-S';
+    $opts{silent} = 1 if $ARGV[0] eq '-S';
     $otherperls = 0 if $ARGV[0] eq '-o';
     $force = 1 if $ARGV[0] eq '-f';
-    $verbose = 1 if $ARGV[0] eq '-V' || $ARGV [0] eq '-n';
+    $opts{verbose} = 1 if $ARGV[0] eq '-V' || $ARGV [0] eq '-n';
     $archname = 1 if $ARGV[0] eq '-A';
     $nwinstall = 1 if $ARGV[0] eq '-netware';
     $nopods = 1 if $ARGV[0] eq '-p';
-    $destdir = $1 if $ARGV[0] =~ /^-?-destdir=(.*)$/;
+    $opts{destdir} = $1 if $ARGV[0] =~ /^-?-destdir=(.*)$/;
     if ($ARGV[0] eq '-?' or $ARGV[0] =~ /^-?-h/) {
 	print <<"EOT";
 Usage $0: [switches]
@@ -177,23 +153,36 @@ if ((-e "testcompile") && (defined($ENV{'COMPILE'}))) {
     push(@scripts, map("$_.exe", @scripts));
 }
 
-find(sub {
-    if ("$File::Find::dir/$_" =~ m{^ext\b(.*)/([^/]+)\.pm$}) {
-	my($path, $modname) = ($1,$2);
+# Exclude nonxs extensions that are not architecture dependent
+my @nonxs = grep(!/^Errno$/, split(' ', $Config{'nonxs_ext'}));
 
-	# strip to optional "/lib", or remove trailing component
-	$path =~ s{.*/lib\b}{} or $path =~ s{/[^/]*$}{};
+my @ext_dirs = qw(cpan dist ext);
+foreach my $ext_dir (@ext_dirs) {
+    find(sub {
+	if (($File::Find::name =~ m{^$ext_dir\b(.*)/([^/]+)\.pm$}) &&
+	    ! grep { (my $dir = $_) =~ s/\//-/g;
+		     $File::Find::name =~ /^$ext_dir\/$dir\// } @nonxs)
+	{
+	    my($path, $modname) = ($1,$2);
 
-	# strip any leading /
-	$path =~ s{^/}{};
+	    # Change hypenated name like Filter-Util-Call to nested
+	    # directory name Filter/Util/Call
+	    $path =~ s{-}{/}g;
 
-	# reconstitute canonical module name
-	$modname = "$path/$modname" if length $path;
+	    # strip to optional "/lib", or remove trailing component
+	    $path =~ s{.*/lib\b}{} or $path =~ s{/[^/]*$}{};
 
-	# remember it
-	$archpms{$modname} = 1;
-    }
-}, 'ext');
+	    # strip any leading /
+	    $path =~ s{^/}{};
+
+	    # reconstitute canonical module name
+	    $modname = "$path/$modname" if length $path;
+
+	    # remember it
+	    $archpms{$modname} = 1;
+	}
+    }, $ext_dir);
+}
 
 # print "[$_]\n" for sort keys %archpms;
 
@@ -205,13 +194,13 @@ die "Patchlevel of perl ($patchlevel)",
 	if $patchlevel != $Config{'PERL_VERSION'};
 
 # Fetch some frequently-used items from %Config
-my $installbin = "$destdir$Config{installbin}";
-my $installscript = "$destdir$Config{installscript}";
-my $installprivlib = "$destdir$Config{installprivlib}";
-my $installarchlib = "$destdir$Config{installarchlib}";
-my $installsitelib = "$destdir$Config{installsitelib}";
-my $installsitearch = "$destdir$Config{installsitearch}";
-my $installman1dir = "$destdir$Config{installman1dir}";
+my $installbin = "$opts{destdir}$Config{installbin}";
+my $installscript = "$opts{destdir}$Config{installscript}";
+my $installprivlib = "$opts{destdir}$Config{installprivlib}";
+my $installarchlib = "$opts{destdir}$Config{installarchlib}";
+my $installsitelib = "$opts{destdir}$Config{installsitelib}";
+my $installsitearch = "$opts{destdir}$Config{installsitearch}";
+my $installman1dir = "$opts{destdir}$Config{installman1dir}";
 my $man1ext = $Config{man1ext};
 my $libperl = $Config{libperl};
 # Shared library and dynamic loading suffixes.
@@ -236,7 +225,6 @@ if ($nwinstall) {
     $installsitelib = $Config{installnwlib};
 }
 
-my $d_dosuid = $Config{d_dosuid};
 my $binexp = $Config{binexp};
 
 if ($Is_VMS) {  # Hang in there until File::Spec hits the big time
@@ -249,13 +237,11 @@ if ($Is_VMS) {  # Hang in there until File::Spec hits the big time
 
 # Do some quick sanity checks.
 
-if (!$nonono && $d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
-
    $installbin		|| die "No installbin directory in config.sh\n";
--d $installbin		|| mkpath($installbin, $verbose, 0777);
--d $installbin		|| $nonono || die "$installbin is not a directory\n";
--w $installbin		|| $nonono || die "$installbin is not writable by you\n"
-	unless $installbin =~ m#^/afs/# || $nonono;
+-d $installbin		|| mkpath($installbin, $opts{verbose}, 0777);
+-d $installbin		|| $opts{notify} || die "$installbin is not a directory\n";
+-w $installbin		|| $opts{notify} || die "$installbin is not writable by you\n"
+	unless $installbin =~ m#^/afs/# || $opts{notify};
 
 if (!$Is_NetWare) {
 if (!$Is_VMS) {
@@ -267,7 +253,6 @@ else {
         -x $dbg . 'perl' . $exe_ext	|| die "${dbg}perl$exe_ext isn't executable!\n";
     }
 }
--x 'suidperl' . $exe_ext|| die "suidperl isn't executable!\n" if $d_dosuid;
 
 -f 't/rantests'		|| $Is_W32
 			|| warn "WARNING: You've never run 'make test' or",
@@ -275,49 +260,15 @@ else {
 } #if (!$Is_NetWare)
 
 # This will be used to store the packlist
-my $packlist = ExtUtils::Packlist->new("$installarchlib/.packlist");
+$packlist = ExtUtils::Packlist->new("$installarchlib/.packlist");
 
 if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) {
     my $perldll;
 
     if ($Is_Cygwin) {
 	$perldll = $libperl;
-	my $v_e_r_s = $ver; $v_e_r_s =~ tr/./_/;
-	$perldll =~ s/(\..*)?$/$v_e_r_s.$dlext/;
-	$perldll =~ s/^lib/cyg/;
-	if ($Config{useshrplib} eq 'true') {
-	    # install ld2 and perlld as well
-	    foreach ('ld2', 'perlld') {
-		safe_unlink("$installbin/$_");
-		copy("$_", "$installbin/$_");
-		chmod(0755, "$installbin/$_");
-		$packlist->{"$installbin/$_"} = { type => 'file' };
-	    };
-	    open (LD2, ">$installbin/ld2");
-	    print LD2 <<SHELL;
-#!/bin/sh
-#
-# ld wrapper, passes all args to perlld;
-#
-for trythis in $installbin/perl
-do
-  if [ -x \$trythis ]
-  then
-    \$trythis $installbin/perlld "\$\@"
-    exit \$?
-  fi
-done
-# hard luck!
-echo I see no perl executable around there
-echo perl is required to build dynamic libraries
-echo look if the path to perl in /bin/ld2 is correct
-exit 1
-SHELL
-	    close LD2;
-	    chmod(0755, "$installbin/ld2");
-	};
     } else {
-	$perldll = 'perl59.' . $dlext;
+	$perldll = 'perl5'.$Config{patchlevel}.'.'.$dlext;
     }
 
     if ($dlsrc ne "dl_none.xs") {
@@ -389,25 +340,20 @@ else {
     copy("perl.exe", "$installbin/$perl.exe");
 }
 
-safe_unlink("$installbin/s$perl_verbase$ver$exe_ext");
-if ($d_dosuid) {
-    copy("suidperl$exe_ext", "$installbin/s$perl_verbase$ver$exe_ext");
-    chmod(04711, "$installbin/s$perl_verbase$ver$exe_ext");
-}
-
 # Install library files.
 
 my ($do_installarchlib, $do_installprivlib) = (0, 0);
+my $vershort = ($Is_Cygwin and !$Config{usedevel}) ? substr($ver,0,-2) : $ver;
 
-mkpath($installprivlib, $verbose, 0777);
-mkpath($installarchlib, $verbose, 0777);
-mkpath($installsitelib, $verbose, 0777) if ($installsitelib);
-mkpath($installsitearch, $verbose, 0777) if ($installsitearch);
+mkpath($installprivlib, $opts{verbose}, 0777);
+mkpath($installarchlib, $opts{verbose}, 0777);
+mkpath($installsitelib, $opts{verbose}, 0777) if ($installsitelib);
+mkpath($installsitearch, $opts{verbose}, 0777) if ($installsitearch);
 
 if (chdir "lib") {
     $do_installarchlib = ! samepath($installarchlib, '.');
     $do_installprivlib = ! samepath($installprivlib, '.');
-    $do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$ver/);
+    $do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$vershort/);
 
     if ($do_installarchlib || $do_installprivlib) {
 	find(\&installlib, '.');
@@ -419,14 +365,33 @@ else {
 }
 
 # Install header files and libraries.
-mkpath("$installarchlib/CORE", $verbose, 0777);
+mkpath("$installarchlib/CORE", $opts{verbose}, 0777);
 my @corefiles;
 if ($Is_VMS) {  # We did core file selection during build
     my $coredir = "lib/$Config{archname}/$ver/CORE";
     $coredir =~ tr/./_/;
     map { s|^$coredir/||i; } @corefiles = <$coredir/*.*>;
 }
-else {
+elsif ($Is_Cygwin) { # On Cygwin symlink it to CORE to make Makefile happy
+    @corefiles = <*.h libperl*.* perl*$Config{lib_ext}>;
+    my $coredll = "$installarchlib/CORE/$libperl";
+    safe_unlink($coredll);
+    ( $Config{'d_link'} eq 'define' &&
+      eval {
+          CORE::link("$installbin/$libperl", $coredll);
+          $packlist->{$coredll} = { from => "$installbin/$libperl",
+                                    type => 'link' };
+      }
+    ) ||
+    eval {
+        symlink("$installbin/$libperl", $coredll);
+        $packlist->{$coredll} = { from => "$installbin/$libperl",
+                                  type => 'link' };
+    } ||
+    ( copy("$installbin/$libperl", $coredll) &&
+      push(@corefiles, $coredll)
+    )
+} else {
     # [als] hard-coded 'libperl' name... not good!
     @corefiles = <*.h libperl*.* perl*$Config{lib_ext}>;
 
@@ -434,7 +399,7 @@ else {
     push(@corefiles,'perl.exp') if $^O eq 'aix';
     if ($^O eq 'mpeix') {
 	# MPE needs mpeixish.h installed as well.
-	mkpath("$installarchlib/CORE/mpeix", $verbose, 0777);
+	mkpath("$installarchlib/CORE/mpeix", $opts{verbose}, 0777);
 	push(@corefiles,'mpeix/mpeixish.h');
     }
     # If they have built sperl.o...
@@ -470,9 +435,6 @@ if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VM
 	link("$installbin/$perl_verbase$ver$exe_ext",
 		"$installbin/$perl$exe_ext");
     }
-    link("$installbin/$perl_verbase$ver$exe_ext",
-	    "$installbin/suid$perl$exe_ext")
-      if $d_dosuid;
 }
 
 # For development purposes it can be very useful to have multiple perls
@@ -498,7 +460,7 @@ if ($archname && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VMS) {
 my $mainperl_is_instperl = 0;
 
 if ($Config{installusrbinperl} && $Config{installusrbinperl} eq 'define' &&
-    !$versiononly && !$nonono && !$Is_W32 && !$Is_NetWare && !$Is_VMS && -t STDIN && -t STDERR
+    !$versiononly && !$opts{notify} && !$Is_W32 && !$Is_NetWare && !$Is_VMS && -t STDIN && -t STDERR
 	&& -w $mainperldir && ! samepath($mainperldir, $installbin)) {
     my($usrbinperl)	= "$mainperldir/$perl$exe_ext";
     my($instperl)	= "$installbin/$perl$exe_ext";
@@ -566,7 +528,7 @@ sub script_alias {
 }
 
 # Install scripts.
-mkpath($installscript, $verbose, 0777);
+mkpath($installscript, $opts{verbose}, 0777);
 if ($versiononly) {
     for (@scripts) {
 	(my $base = $_) =~ s#.*/##;
@@ -600,23 +562,8 @@ if ($versiononly) {
 # ($installprivlib/pods for cygwin).
 
 my $pod = ($Is_Cygwin || $Is_Darwin || $Is_VMS || $Is_W32) ? 'pods' : 'pod';
-if ( !$versiononly || ($installprivlib =~ m/\Q$ver/)) {
-    mkpath("${installprivlib}/$pod", $verbose, 0777);
-
-    # If Perl 5.003's perldiag.pod is there, rename it.
-    if (open POD, "${installprivlib}/$pod/perldiag.pod") {
-	read POD, $_, 4000;
-	close POD;
-	# Some of Perl 5.003's diagnostic messages ended with periods.
-	if (/^=.*\.$/m) {
-	    my ($from, $to) = ("${installprivlib}/$pod/perldiag.pod",
-			       "${installprivlib}/$pod/perldiag-5.003.pod");
-	    print "  rename $from $to";
-	    rename($from, $to)
-		or warn "Couldn't rename $from to $to: $!\n"
-		unless $nonono;
-	}
-    }
+if ( !$versiononly || ($installprivlib =~ m/\Q$vershort/)) {
+    mkpath("${installprivlib}/$pod", $opts{verbose}, 0777);
 
     for (@pods) {
 	# $_ is a name like  pod/perl.pod
@@ -650,7 +597,9 @@ if (!$versiononly && $otherperls) {
 	next unless m,^/,;
 	# Use &samepath here because some systems have other dirs linked
 	# to $mainperldir (like SunOS)
+	next unless -d;
 	next if samepath($_, $binexp);
+	next if samepath($_, cwd());
 	next if ($mainperl_is_instperl && samepath($_, $mainperldir));
 	my $otherperl = "$_/$perl$exe_ext";
 	next if $otherperls{$otherperl}++;
@@ -668,13 +617,16 @@ if (!$versiononly && $otherperls) {
 
 }
 
-$packlist->write() unless $nonono;
-print "  Installation complete\n" if $verbose;
+$packlist->write() unless $opts{notify};
+print "  Installation complete\n" if $opts{verbose};
 
 exit 0;
 
 ###############################################################################
 
+# If these are needed elsewhere, move them into install_lib.pl rather than
+# copying them.
+
 sub yn {
     my($prompt) = @_;
     my($answer);
@@ -685,33 +637,17 @@ sub yn {
     ($answer =~ m/^[yY]/);
 }
 
-sub unlink {
-    my(@names) = @_;
-    my($cnt) = 0;
-
-    return scalar(@names) if $Is_VMS;
-
-    foreach my $name (@names) {
-	next unless -e $name;
-	chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_Cygwin || $Is_NetWare);
-	print "  unlink $name\n" if $verbose;
-	( CORE::unlink($name) and ++$cnt
-	  or warn "Couldn't unlink $name: $!\n" ) unless $nonono;
-    }
-    return $cnt;
-}
-
 sub safe_unlink {
-    return if $nonono or $Is_VMS;
+    return if $opts{notify} or $Is_VMS;
     my @names = @_;
     foreach my $name (@names) {
 	next unless -e $name;
 	chmod 0777, $name if ($Is_OS2 || $Is_W32 || $Is_NetWare);
-	print "  unlink $name\n" if $verbose;
+	print "  unlink $name\n" if $opts{verbose};
 	next if CORE::unlink($name);
 	warn "Couldn't unlink $name: $!\n";
 	if ($! =~ /busy/i) {
-	    print "  mv $name $name.old\n" if $verbose;
+	    print "  mv $name $name.old\n" if $opts{verbose};
 	    safe_rename($name, "$name.old")
 		or warn "Couldn't rename $name: $!\n";
 	}
@@ -732,58 +668,16 @@ sub safe_rename {
     unlink($from);
 }
 
-sub link {
-    my($from,$to) = @_;
-    my($success) = 0;
-
-    my $xfrom = $from;
-    $xfrom =~ s/^\Q$destdir\E// if $destdir;
-    my $xto = $to;
-    $xto =~ s/^\Q$destdir\E// if $destdir;
-    print $verbose ? "  ln $xfrom $xto\n" : "  $xto\n" unless $silent;
-    eval {
-	CORE::link($from, $to)
-	    ? $success++
-	    : ($from =~ m#^/afs/# || $to =~ m#^/afs/#)
-	      ? die "AFS"  # okay inside eval {}
-	      : die "Couldn't link $from to $to: $!\n"
-	  unless $nonono;
-	$packlist->{$xto} = { from => $xfrom, type => 'link' };
-    };
-    if ($@) {
-	warn "Replacing link() with File::Copy::copy(): $@";
-	print $verbose ? "  cp $from $xto\n" : "  $xto\n" unless $silent;
-	print "  creating new version of $xto\n"
-		 if $Is_VMS and -e $to and !$silent;
-	unless ($nonono or File::Copy::copy($from, $to) and ++$success) {
-	    # Might have been that F::C::c can't overwrite the target
-	    warn "Couldn't copy $from to $to: $!\n"
-		unless -f $to and (chmod(0666, $to), unlink $to)
-			and File::Copy::copy($from, $to) and ++$success;
-	}
-	$packlist->{$xto} = { type => 'file' };
-    }
-    $success;
-}
-
-sub chmod {
-    my($mode,$name) = @_;
-
-    return if ($^O eq 'dos');
-    printf "  chmod %o %s\n", $mode, $name if $verbose;
-    CORE::chmod($mode,$name)
-	|| warn sprintf("Couldn't chmod %o %s: $!\n", $mode, $name)
-      unless $nonono;
-}
-
 sub copy {
     my($from,$to) = @_;
 
     my $xto = $to;
-    $xto =~ s/^\Q$destdir\E// if $destdir;
-    print $verbose ? "  cp $from $xto\n" : "  $xto\n" unless $silent;
-    print "  creating new version of $xto\n" if $Is_VMS and -e $to and !$silent;
-    unless ($nonono or File::Copy::copy($from, $to)) {
+    $xto =~ s/^\Q$opts{destdir}\E//;
+    print $opts{verbose} ? "  cp $from $xto\n" : "  $xto\n"
+	unless $opts{silent};
+    print "  creating new version of $xto\n"
+	if $Is_VMS and -e $to and !$opts{silent};
+    unless ($opts{notify} or File::Copy::copy($from, $to)) {
 	# Might have been that F::C::c can't overwrite the target
 	warn "Couldn't copy $from to $to: $!\n"
 	    unless -f $to and (chmod(0666, $to), unlink $to)
@@ -792,22 +686,6 @@ sub copy {
     $packlist->{$xto} = { type => 'file' };
 }
 
-sub samepath {
-    my($p1, $p2) = @_;
-
-    return (lc($p1) eq lc($p2)) if ($Is_W32 || $Is_NetWare);
-
-    if ($p1 ne $p2) {
-	my($dev1, $ino1, $dev2, $ino2);
-	($dev1, $ino1) = stat($p1);
-	($dev2, $ino2) = stat($p2);
-	($dev1 == $dev2 && $ino1 == $ino2);
-    }
-    else {
-	1;
-    }
-}
-
 sub installlib {
     my $dir = $File::Find::dir;
     $dir =~ s#^\.(?![^/])/?##;
@@ -823,7 +701,7 @@ sub installlib {
 
     # ignore patch backups, RCS files, emacs backup & temp files and the
     # .exists files, .PL files, and test files.
-    return if $name =~ m{\.orig$|\.rej$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.plc$|\.t$|^test\.pl$|^dbm_filter_util.pl$} ||
+    return if $name =~ m{\.orig$|\.rej$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.plc$|\.t$|^test\.pl$|^dbm_filter_util\.pl$|^filter-util\.pl$|^uupacktool\.pl$|^\.gitignore$} ||
 	      $dir  =~ m{/t(?:/|$)};
     # ignore the cpan script in lib/CPAN/bin, the instmodsh and xsubpp
     # scripts in lib/ExtUtils, the prove script in lib/Test/Harness,
@@ -857,11 +735,13 @@ sub installlib {
 
     $name = "$dir/$name" if $dir ne '';
 
+    return if $name eq 'ExtUtils/XSSymSet.pm' and !$Is_VMS;
+
     my $installlib = $installprivlib;
-    if ($dir =~ /^auto/ ||
+    if ($dir =~ /^auto\// ||
 	  ($name =~ /^(.*)\.(?:pm|pod)$/ && $archpms{$1}) ||
 	  ($name =~ /^(.*)\.(?:h|lib)$/i && ($Is_W32 || $Is_NetWare)) ||
-	  $name eq 'Config_heavy.pl'
+	  $name=~/^Config_(heavy|git)\.pl\z/
        ) {
 	$installlib = $installarchlib;
 	return unless $do_installarchlib;
@@ -879,11 +759,11 @@ sub installlib {
 	    unlink("$installarchlib/$name");
 	}
 	my $xname = "$installlib/$name";
-	$xname =~ s/^\Q$destdir\E// if $destdir;
+	$xname =~ s/^\Q$opts{destdir}\E//;
 	$packlist->{$xname} = { type => 'file' };
-	if ($force || compare($_, "$installlib/$name") || $nonono) {
+	if ($force || compare($_, "$installlib/$name") || $opts{notify}) {
 	    unlink("$installlib/$name");
-	    mkpath("$installlib/$dir", $verbose, 0777);
+	    mkpath("$installlib/$dir", $opts{verbose}, 0777);
 	    # HP-UX (at least) needs to maintain execute permissions
 	    # on dynamically-loaded libraries.
 	    if ($Is_NetWare && !$nwinstall) {
@@ -926,7 +806,7 @@ sub copy_if_diff {
     my($from,$to)=@_;
     return 1 if (($^O eq 'VMS') && (-d $from));
     my $xto = $to;
-    $xto =~ s/^\Q$destdir\E// if $destdir;
+    $xto =~ s/^\Q$opts{destdir}\E//;
     my $perlpodbadsymlink;
     if ($from =~ m!^pod/perl[\w-]+\.pod$! &&
 	-l $from &&
@@ -940,9 +820,9 @@ sub copy_if_diff {
     }
     -f $from || $perlpodbadsymlink || warn "$0: $from not found";
     $packlist->{$xto} = { type => 'file' };
-    if ($force || compare($from, $to) || $nonono) {
+    if ($force || compare($from, $to) || $opts{notify}) {
 	safe_unlink($to);   # In case we don't have write permissions.
-	if ($nonono) {
+	if ($opts{notify}) {
 	    $from = $depth . "/" . $from if $depth;
 	}
 	if ($perlpodbadsymlink && $from =~ m!^pod/perl(.+)\.pod$!) {
@@ -950,7 +830,7 @@ sub copy_if_diff {
 	}
 	copy($from, $to);
 	# Restore timestamps if it's a .a library or for OS/2.
-	if (!$nonono && ($Is_OS2 || $to =~ /\.a$/)) {
+	if (!$opts{notify} && ($Is_OS2 || $to =~ /\.a$/)) {
 	    my ($atime, $mtime) = (stat $from)[8,9];
 	    utime $atime, $mtime, $to;
 	}
@@ -971,14 +851,14 @@ sub strip
 
     foreach my $file (@args) {
 	if (-f $file) {
-	    if ($verbose) {
+	    if ($opts{verbose}) {
 		print "  strip " . join(' ', @opts);
 		print " " if (@opts);
 		print "$file\n";
 	    }
 	    system("strip", @opts, $file);
 	} else {
-	    print "# file '$file' skipped\n" if $verbose;
+	    print "# file '$file' skipped\n" if $opts{verbose};
 	}
     }
 }