diff options
| author | Reini Urban <rurban@x-ray.at> | 2008-07-28 14:55:40 +0200 |
|---|---|---|
| committer | H.Merijn Brand <h.m.brand@xs4all.nl> | 2008-08-11 13:15:08 +0000 |
| commit | 5f9145a3c5d730d3a29901fe5c70a26f92663207 (patch) | |
| tree | b717470dbddac359aca0f6e6ac8deebc45fcba7e /installperl | |
| parent | 07a28ea7fedd308f0ccac00940bfc1b314e01e37 (diff) | |
| download | perl-5f9145a3c5d730d3a29901fe5c70a26f92663207.tar.gz | |
Cygwin build harmonization, remove cygwin/Makefile.SHs
From: "Reini Urban" <rurban@x-ray.at>
Message-ID: <6910a60807280355g129511d9v61c9763c3fd12a27@mail.gmail.com>
p4raw-id: //depot/perl@34200
Diffstat (limited to 'installperl')
| -rwxr-xr-x | installperl | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/installperl b/installperl index 623034eead..c717750c50 100755 --- a/installperl +++ b/installperl @@ -253,11 +253,8 @@ if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin) { if ($Is_Cygwin) { $perldll = $libperl; - 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 { - $perldll = 'perl511.' . $dlext; + $perldll = 'perl5'.$Config{patchlevel}.'.'.$dlext; } if ($dlsrc ne "dl_none.xs") { @@ -338,7 +335,7 @@ if ($d_dosuid) { # Install library files. my ($do_installarchlib, $do_installprivlib) = (0, 0); -my $vershort = $Is_Cygwin ? substr($ver,0,-2) : $ver; +my $vershort = ($Is_Cygwin and !$Config{usedevel}) ? substr($ver,0,-2) : $ver; mkpath($installprivlib, $opts{verbose}, 0777); mkpath($installarchlib, $opts{verbose}, 0777); |