From aefeaec11418a679bed9150d6191769d3a4b756b Mon Sep 17 00:00:00 2001
From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Tue, 3 Apr 2001 18:02:31 +0000
Subject: 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..)
---
 x2p/find2perl.PL |  4 +++-
 x2p/s2p.PL       | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'x2p')

diff --git a/x2p/find2perl.PL b/x2p/find2perl.PL
index b89f01ea84..adcf42ace4 100644
--- 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 6d9f8eebe5..d215781dae 100644
--- 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.
-- 
cgit v1.2.1