diff options
| author | Reini Urban <rurban@x-ray.at> | 2008-03-08 21:55:36 +0100 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2008-03-11 19:47:44 +0000 |
| commit | 7e73a9801b84ea9d4c4040e65a168d6571cee339 (patch) | |
| tree | e9b7a2ad5c90ea4749e2849f9757684290f86c6a /installperl | |
| parent | 09ec0e73029ccbac204a9e57a652ce1ed9ae0929 (diff) | |
| download | perl-7e73a9801b84ea9d4c4040e65a168d6571cee339.tar.gz | |
Re: Perl @ http://www.ccl4.org/~nick/P/perl-33444.tar.bz2
Message-ID: <47D2EF38.10503@x-ray.at>
* CYG04 At least on cygwin strip the last number
from the dll. This is in the cygwin.com build since years.
p4raw-id: //depot/perl@33481
Diffstat (limited to 'installperl')
| -rwxr-xr-x | installperl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/installperl b/installperl index f635918796..b89990b9cb 100755 --- a/installperl +++ b/installperl @@ -283,7 +283,7 @@ if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) { if ($Is_Cygwin) { $perldll = $libperl; - my $v_e_r_s = $ver; $v_e_r_s =~ tr/./_/; + my $v_e_r_s = substr($ver,0,-2); $v_e_r_s =~ tr/./_/; $perldll =~ s/(\..*)?$/$v_e_r_s.$dlext/; $perldll =~ s/^lib/cyg/; } else { @@ -368,6 +368,7 @@ if ($d_dosuid) { # Install library files. my ($do_installarchlib, $do_installprivlib) = (0, 0); +my $vershort = $Is_Cygwin ? substr($ver,0,-2) : $ver; mkpath($installprivlib, $verbose, 0777); mkpath($installarchlib, $verbose, 0777); @@ -377,7 +378,7 @@ mkpath($installsitearch, $verbose, 0777) if ($installsitearch); if (chdir "lib") { $do_installarchlib = ! samepath($installarchlib, '.'); $do_installprivlib = ! samepath($installprivlib, '.'); - $do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$ver/); + $do_installprivlib = 0 if $versiononly && !($installprivlib =~ m/\Q$vershort/); if ($do_installarchlib || $do_installprivlib) { find(\&installlib, '.'); @@ -570,7 +571,7 @@ if ($versiononly) { # ($installprivlib/pods for cygwin). my $pod = ($Is_Cygwin || $Is_Darwin || $Is_VMS || $Is_W32) ? 'pods' : 'pod'; -if ( !$versiononly || ($installprivlib =~ m/\Q$ver/)) { +if ( !$versiononly || ($installprivlib =~ m/\Q$vershort/)) { mkpath("${installprivlib}/$pod", $verbose, 0777); # If Perl 5.003's perldiag.pod is there, rename it. |