From: Brendan O'Dea <bod@debian.org>
Date: Wed, 31 May 2006 22:51:48 +0000 (+1000)
Subject: Was: Bug#369481: perl-base: 5.8.4-8sarge4 seemed to trigger "weak references not... 
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1a959400560e3bbe1b60592fa513f3356e654efa;p=p5sagit%2Fp5-mst-13.2.git

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
---

diff --git a/installperl b/installperl
index 76d299d..a45c3fd 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