Add a file utils/cpan.PL to generate the "cpan" utility,

also separately maintained on CPAN, and now moved as
lib/CPAN/bin/cpan. Tweak installperl to avoid installing
this last file.

p4raw-id: //depot/perl@19065

1 files changed, 5 insertions, 3 deletions

diff --git a/installperl b/installperl
index e775c9c978..95f9793437 100755
--- a/installperl
+++ b/installperl
@@ -747,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)/};