summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-09-17 10:59:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-09-17 10:59:14 +0000
commit711e935d8e689d3b4f62ec215513323498953636 (patch)
treef4426e64a2be26025fa9e23585d2f98ee784ba2c
parent16815663c893dc131728bdde4864a4c697214771 (diff)
downloaddrakx-711e935d8e689d3b4f62ec215513323498953636.tar
drakx-711e935d8e689d3b4f62ec215513323498953636.tar.gz
drakx-711e935d8e689d3b4f62ec215513323498953636.tar.bz2
drakx-711e935d8e689d3b4f62ec215513323498953636.tar.xz
drakx-711e935d8e689d3b4f62ec215513323498953636.zip
add /usr/lib/qt3/lib (and sometimes /usr/lib/qt3/lib64) in ld.so.conf
(needed for upgrade where package renaming can cause this to disappear)
-rw-r--r--perl-install/any.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 89dda8991..721fe7fcf 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -522,9 +522,11 @@ sub rotate_logs {
sub writeandclean_ldsoconf {
my ($prefix) = @_;
my $file = "$prefix/etc/ld.so.conf";
- output $file,
- grep { !m|^(/usr)?/lib(64)?$| } #- no need to have /lib and /usr/lib in ld.so.conf
- uniq cat_($file), (if_(arch() =~ /x86_64/, "/usr/X11R6/lib64\n"), "/usr/X11R6/lib\n");
+ my @l = chomp_(cat_($file));
+ @l = grep { !m|^(/usr)?/lib(64)?$| } @l; #- no need to have /lib and /usr/lib in ld.so.conf
+ push @l, '/usr/X11R6/lib', if_(arch() =~ /x86_64/, '/usr/X11R6/lib64');
+ push @l, grep { -d "$::prefix$_" } '/usr/lib/qt3/lib', if_(arch() =~ /x86_64/, '/usr/lib/qt3/lib64'); #- needed for upgrade where package renaming can cause this to disappear
+ output($file, map { "$_\n" } uniq(@l));
}
sub shells() {