Integrate change #9533 from maintperl into mainline.

better fix for change#9517 to accomodate UNC paths like
\\server\share\foo, and paths with trailing backslash
like c:\this\

p4raw-link: @9533 on //depot/maint-5.6/perl: aa5978ee553e6e5cbffd44b8ee9d25a8ff75c771
p4raw-link: @9517 on //depot/maint-5.6/perl: 541b948d383abe4f534f846ff692d582506919cf

p4raw-id: //depot/perl@9536
p4raw-integrated: from //depot/maint-5.6/perl@9535 'copy in'
	utils/perldoc.PL x2p/find2perl.PL (@9517..) 'merge in'
	x2p/s2p.PL (@9517..)

diff --git a/utils/perldoc.PL b/utils/perldoc.PL
index 8bd6577..cfb773e 100644 (file)
--- a/utils/perldoc.PL
+++ b/utils/perldoc.PL
@@ -36,9 +36,15 @@ use strict;
 # make sure creat()s are neither too much nor too little
 INIT { eval { umask(0077) } }   # doubtless someone has no mask
 
+(my \$pager = <<'/../') =~ s/\\s*\\z//;
+$Config{pager}
+/../
 my \@pagers = ();
-push \@pagers, q[$Config{'pager'}] if -x q[$Config{'pager'}];
-my \$bindir = '$Config{scriptdir}';
+push \@pagers, \$pager if -x \$pager;
+
+(my \$bindir = <<'/../') =~ s/\\s*\\z//;
+$Config{scriptdir}
+/../
 
 !GROK!THIS!
 

diff --git a/x2p/find2perl.PL b/x2p/find2perl.PL
index b89f01e..adcf42a 100644 (file)
--- a/x2p/find2perl.PL
+++ b/x2p/find2perl.PL
@@ -29,7 +29,9 @@ print OUT <<"!GROK!THIS!";
 $Config{startperl}
     eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
       if \$running_under_some_shell;
-my \$perlpath = '$Config{perlpath}';
+(my \$perlpath = <<'/../') =~ s/\\s*\\z//;
+$Config{perlpath}
+/../
 !GROK!THIS!
 
 # In the following, perl variables are not expanded during extraction.

diff --git a/x2p/s2p.PL b/x2p/s2p.PL
index 6d9f8ee..d215781 100644 (file)
--- a/x2p/s2p.PL
+++ b/x2p/s2p.PL
@@ -29,8 +29,14 @@ print OUT <<"!GROK!THIS!";
 $Config{startperl}
     eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
        if \$running_under_some_shell;
-my \$startperl = '$Config{startperl}';
-my \$perlpath = '$Config{perlpath}';
+my $startperl;
+my $perlpath;
+(\$startperl = <<'/../') =~ s/\\s*\\z//;
+$Config{startperl}
+/../
+(\$perlpath = <<'/../') =~ s/\\s*\\z//;
+$Config{perlpath}
+/../
 !GROK!THIS!
 
 # In the following, perl variables are not expanded during extraction.