summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-11-25 13:46:22 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-11-25 13:46:22 +0000
commitdcbb51721609f47686a816f9a332c48dff778b9b (patch)
tree6458454985fc431faf69a241f6cff2e09f0ba284 /perl-install
parent025275149a220c10f4768ff53be5ea78f512d087 (diff)
downloaddrakx-dcbb51721609f47686a816f9a332c48dff778b9b.tar
drakx-dcbb51721609f47686a816f9a332c48dff778b9b.tar.gz
drakx-dcbb51721609f47686a816f9a332c48dff778b9b.tar.bz2
drakx-dcbb51721609f47686a816f9a332c48dff778b9b.tar.xz
drakx-dcbb51721609f47686a816f9a332c48dff778b9b.zip
remove /lib and /usr/lib with more verbose code
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index f86e4fd11..4bcb66103 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -526,13 +526,17 @@ sub writeandclean_ldsoconf {
my ($prefix) = @_;
my $file = "$prefix/etc/ld.so.conf";
my @l = chomp_(cat_($file));
- @l = grep { !m|^(/usr)?/lib(64)?$| } @l; #- no need to have /lib and /usr/lib in ld.so.conf
+ my @default = ('/lib', '/usr/lib'); #- no need to have /lib and /usr/lib in ld.so.conf
my @suggest = ('/usr/X11R6/lib', '/usr/lib/qt3/lib'); #- needed for upgrade where package renaming can cause this to disappear
+
if (arch() =~ /x86_64/) {
+ push @default, map { $_, $_ . '64' } @default;
push @suggest, map { $_, $_ . '64' } @suggest;
}
push @l, grep { -d "$::prefix$_" } @suggest;
+ @l = difference2(\@l, \@default);
+
output($file, map { "$_\n" } uniq(@l));
}