X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=95f9793437e3d02668eb7f3f46e3d241e938ec96;hb=929a4907d56d33ad69150da8025e2267d4eeb613;hp=ebddeca4dde078faaec4348c8df3614f49e86e71;hpb=2e2b85db5c320075c6df5b304492078465626441;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/installperl b/installperl
index ebddeca..95f9793 100755
--- a/installperl
+++ b/installperl
@@ -396,17 +396,6 @@ foreach my $file (@corefiles) {
     }
 }
 
-# Switch in the 5.005-threads versions of he threadsafe queue and semaphore
-# modules if so needed.
-if ($Config{use5005threads}) {
-    for my $m (qw(Queue Semaphore)) {
-	my $t = "$installprivlib/Thread/$m.pm";
-	unlink $t;
-	copy("ext/Thread/$m.pmx", $t);
-	chmod(0444, $t);
-    }
-}
-
 # Install main perl executables
 # Make links to ordinary names if installbin directory isn't current directory.
 
@@ -758,16 +747,18 @@ sub installlib {
 
     my $name = $_;
 
-    # Ignore RCS and CVS directories.
-    if (($name eq 'CVS' or $name eq 'RCS') and -d $name) {
+    # Ignore version control directories.
+    if (($name eq 'CVS' or $name eq 'RCS' or $name eq '.svn') and -d $name) {
 	$File::Find::prune = 1;
 	return;
     }
 
     # ignore patch backups, RCS files, emacs backup & temp files and the
     # .exists files, .PL files, and .t files.
-    return if $name =~ m{\.orig$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.t$} ||
+    return if $name =~ m{\.orig$|\.rej$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.t$} ||
 	      $dir  =~ m{/t(?:/|$)};
+    # ignore the cpan script in lib/CPAN/bin (installed later with other utils)
+    return if $name eq 'cpan';
     # ignore the test extensions
     return if $dir =~ m{ext/XS/(?:APItest|Typemap)/};