[inseparable changes from patch from perl5.003_22 to perl5.003_23]

[p5sagit/p5-mst-13.2.git] / x2p / s2p.PL

diff --git a/x2p/s2p.PL b/x2p/s2p.PL
index 6664dcd..73f6787 100644 (file)
--- a/x2p/s2p.PL
+++ b/x2p/s2p.PL
@@ -12,10 +12,9 @@ use File::Basename qw(&basename &dirname);
 
 # This forces PL files to create target in same directory as PL file.
 # This is so that make depend always knows where to find PL derivatives.
-chdir(dirname($0));
-($file = basename($0)) =~ s/\.PL$//;
-$file =~ s/\.pl$//
-       if ($^O eq 'VMS' or $^O eq 'os2');  # "case-forgiving"
+chdir dirname($0);
+$file = basename($0, '.PL');
+$file .= '.com' if $^O eq 'VMS';
 
 open OUT,">$file" or die "Can't create $file: $!";
 
@@ -25,10 +24,11 @@ print "Extracting $file (with variable substitutions)\n";
 # You can use $Config{...} to use Configure variables.
 
 print OUT <<"!GROK!THIS!";
-$Config{'startperl'}
-    eval 'exec perl -S \$0 "\$@"'
-       if 0;
+$Config{startperl}
+    eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
+       if \$running_under_some_shell;
 \$startperl = "$Config{startperl}";
+\$perlpath = "$Config{perlpath}";
 !GROK!THIS!
 
 # In the following, perl variables are not expanded during extraction.
@@ -95,7 +95,7 @@ S2p uses no environment variables.
 
 =head1 AUTHOR
 
-Larry Wall E<lt>F<lwall@jpl-devvax.Jpl.Nasa.Gov>E<gt>
+Larry Wall E<lt>F<larry@wall.org>E<gt>
 
 =head1 FILES
 
@@ -366,7 +366,7 @@ unless ($debug) {
 
     print &q(<<"EOT");
 :      $startperl
-:      eval 'exec perl -S \$0 \${1+"\$@"}'
+:      eval 'exec $perlpath -S \$0 \${1+"\$@"}'
 :              if \$running_under_some_shell;
 :      
 EOT