X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=installperl;h=a7c03da5a49483fdb03da7dd3542100df04ef9c3;hb=f1c8c9362c4d1029d2c52ffe1e972f0f0b3d5771;hp=bd10643b1e57807d65e7ed3f7221f4fa9e56990c;hpb=a55f9fbc122e135334917b92ce41b3960365c082;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/installperl b/installperl
index bd10643..a7c03da 100755
--- a/installperl
+++ b/installperl
@@ -129,7 +129,7 @@ close SCRIPTS;
 
 if ($scr_ext) { @scripts = map { "$_$scr_ext" } @scripts; }
 
-my @pods = $nopods ? () : (<pod/*.pod>);
+my @pods = $nopods ? () : (<pod/*.pod>, 'x2p/a2p.pod');
 
 # Specify here any .pm files that are actually architecture-dependent.
 # (Those included with XS extensions under ext/ are automatically
@@ -404,7 +404,7 @@ if ($Is_VMS) {  # We did core file selection during build
 }
 else {
     # [als] hard-coded 'libperl' name... not good!
-    @corefiles = <*.h libperl*.*>;
+    @corefiles = <*.h libperl*.* perl*$Config{lib_ext}>;
 
     # AIX needs perl.exp installed as well.
     push(@corefiles,'perl.exp') if $^O eq 'aix';
@@ -446,7 +446,7 @@ if (! $versiononly && ! samepath($installbin, '.') && ($^O ne 'dos') && ! $Is_VM
 	link("$installbin/$perl_verbase$ver$exe_ext",
 		"$installbin/$perl$exe_ext");
     }
-    link("$installbin/s$perl_verbase$ver$exe_ext",
+    link("$installbin/$perl_verbase$ver$exe_ext",
 	    "$installbin/suid$perl$exe_ext")
       if $d_dosuid;
 }
@@ -801,9 +801,10 @@ sub installlib {
     # .exists files, .PL files, and test files.
     return if $name =~ m{\.orig$|\.rej$|~$|^#.+#$|,v$|^\.exists|\.PL$|\.plc$|\.t$|^test\.pl$} ||
 	      $dir  =~ m{/t(?:/|$)};
-    # ignore the cpan script in lib/CPAN/bin and the instmodsh and xsubpp
-    # scripts in lib/ExtUtils (they're installed later with other utils)
-    return if $name =~ /^(?:cpan|instmodsh|xsubpp)\z/;
+    # ignore the cpan script in lib/CPAN/bin, the instmodsh and xsubpp
+    # scripts in lib/ExtUtils, and the prove script in lib/Test/Harness
+    # (they're installed later with other utils)
+    return if $name =~ /^(?:cpan|instmodsh|prove)\z/;
     # ignore the Makefiles
     return if $name =~ /^makefile$/i;
     # ignore the test extensions