c2ph.PL fix

[perl5.git] / utils / c2ph.PL

diff --git a/utils/c2ph.PL b/utils/c2ph.PL
index 97d17af..e732d4d 100644 (file)
--- a/utils/c2ph.PL
+++ b/utils/c2ph.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,9 +24,9 @@ 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;
 !GROK!THIS!
 
 # In the following, perl variables are not expanded during extraction.
@@ -1252,7 +1251,7 @@ main() {
 EOF
 
     for $type (@intrinsics) {
-       next if !type || $type eq 'void' || $type =~ /complex/; # sun stuff
+       next if !$type || $type eq 'void' || $type =~ /complex/; # sun stuff
        print <<"EOF";
     printf(mask,sizeof($type), "$type");
 EOF