diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-11-25 13:37:24 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-11-25 13:37:24 +0000 |
| commit | c2c9b3fe99b171ac4c42cd57284d3017e3ce27e5 (patch) | |
| tree | 055f11bbd2d6027035a55ad2f9ad8d477eb28020 | |
| parent | 856eb715f5c3d4fdefff305b84c8660940565e77 (diff) | |
| download | drakx-c2c9b3fe99b171ac4c42cd57284d3017e3ce27e5.tar drakx-c2c9b3fe99b171ac4c42cd57284d3017e3ce27e5.tar.gz drakx-c2c9b3fe99b171ac4c42cd57284d3017e3ce27e5.tar.bz2 drakx-c2c9b3fe99b171ac4c42cd57284d3017e3ce27e5.tar.xz drakx-c2c9b3fe99b171ac4c42cd57284d3017e3ce27e5.zip | |
handle the lib64 case separately
| -rw-r--r-- | perl-install/any.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 268a47519..271166848 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -527,8 +527,12 @@ sub writeandclean_ldsoconf { 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 - 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 + + 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 @suggest, map { $_ . '64' } @suggest; + } + push @l, grep { -d "$::prefix$_" } @suggest; output($file, map { "$_\n" } uniq(@l)); } |