diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2001-04-02 22:22:34 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2001-04-02 22:22:34 +0000 |
| commit | a7486cbbe7de2a5d93376a3ce396434afeb67f8a (patch) | |
| tree | a4c7a57f9684fe2c07602dbb0753ba0668cb530c /x2p | |
| parent | fddda52d45fc9af73e457edff05971627d0c1b6c (diff) | |
| download | perl-a7486cbbe7de2a5d93376a3ce396434afeb67f8a.tar.gz | |
Integrate changes #9511,9514,9517 from maintperl into mainline.
README.win32 tweaks; add a note about alternative location for
getting a gcc-2.95.2 that will build perl properly on windows
add some notes about gutsy threading matters
many of the utilities interpolate literal paths within doublequotes
(fails on dosish platforms where path contains backslashes)
p4raw-link: @9517 on //depot/maint-5.6/perl: 541b948d383abe4f534f846ff692d582506919cf
p4raw-link: @9514 on //depot/maint-5.6/perl: c8c8f510c2814a9e3cbdb8e7ca306018e0f7c510
p4raw-link: @9511 on //depot/maint-5.6/perl: 58a9db026b6f67b774654d285ac34aceada86380
p4raw-id: //depot/perl@9518
p4raw-integrated: from //depot/maint-5.6/perl@9510 'copy in'
utils/perldoc.PL x2p/find2perl.PL (@9312..) 'merge in'
README.win32 (@9227..) x2p/s2p.PL (@9312..) pod/perlguts.pod
(@9507..)
Diffstat (limited to 'x2p')
| -rw-r--r-- | x2p/find2perl.PL | 8 | ||||
| -rw-r--r-- | x2p/s2p.PL | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/x2p/find2perl.PL b/x2p/find2perl.PL index 4d74d06e1b..b89f01ea84 100644 --- a/x2p/find2perl.PL +++ b/x2p/find2perl.PL @@ -29,7 +29,7 @@ print OUT <<"!GROK!THIS!"; $Config{startperl} eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}' if \$running_under_some_shell; -my \$perlpath = "$Config{perlpath}"; +my \$perlpath = '$Config{perlpath}'; !GROK!THIS! # In the following, perl variables are not expanded during extraction. @@ -334,10 +334,8 @@ END if (exists $init{doexec}) { print <<'END'; -BEGIN { - require Cwd; - my $cwd = Cwd::cwd(); -} +use Cwd (); +my $cwd = Cwd::cwd(); sub doexec { my $ok = shift; diff --git a/x2p/s2p.PL b/x2p/s2p.PL index 21a5ee8927..6d9f8eebe5 100644 --- a/x2p/s2p.PL +++ b/x2p/s2p.PL @@ -29,8 +29,8 @@ 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 = '$Config{startperl}'; +my \$perlpath = '$Config{perlpath}'; !GROK!THIS! # In the following, perl variables are not expanded during extraction. |