summaryrefslogtreecommitdiff
path: root/installperl
diff options
context:
space:
mode:
authorBrendan O'Dea <bod@debian.org>2006-06-01 08:51:48 +1000
committerRafael Garcia-Suarez <rgarciasuarez@gmail.com>2006-06-01 12:16:09 +0000
commit1a959400560e3bbe1b60592fa513f3356e654efa (patch)
treec1e22f1bab65697d8720cafc46ed324b402226f0 /installperl
parentcc10766d47d545e4009cee531762b512b79e2e3b (diff)
downloadperl-1a959400560e3bbe1b60592fa513f3356e654efa.tar.gz
Was: Bug#369481: perl-base: 5.8.4-8sarge4 seemed to trigger "weak references not implemented"
Message-ID: <20060531125148.GA20658@londo.c47.org> p4raw-id: //depot/perl@28344
Diffstat (limited to 'installperl')
-rwxr-xr-xinstallperl9
1 files changed, 3 insertions, 6 deletions
diff --git a/installperl b/installperl
index 76d299d215..a45c3fdb0b 100755
--- a/installperl
+++ b/installperl
@@ -181,11 +181,8 @@ find(sub {
if ("$File::Find::dir/$_" =~ m{^ext\b(.*)/([^/]+)\.pm$}) {
my($path, $modname) = ($1,$2);
- # strip trailing component first
- $path =~ s{/[^/]*$}{};
-
- # strip optional "/lib";
- $path =~ s{/lib\b}{};
+ # strip to optional "/lib", or remove trailing component
+ $path =~ s{.*/lib\b}{} or $path =~ s{/[^/]*$}{};
# strip any leading /
$path =~ s{^/}{};
@@ -862,7 +859,7 @@ sub installlib {
}
if (-f $_) {
- if (/\.(?:al|ix)$/ && !($dir =~ m[^auto/(.*)$] && $archpms{$1})) {
+ if (/\.(?:al|ix)$/ && !($dir =~ m[^auto/(.*)$])) {
$installlib = $installprivlib;
#We're installing *.al and *.ix files into $installprivlib,
#but we have to delete old *.al and *.ix files from the 5.000