diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-08-19 16:44:57 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-08-19 16:44:57 +0000 |
| commit | 8d83d221ffdc569ea1914de43d1641131459faa4 (patch) | |
| tree | 1439585269daca9641c1e8cf1567203e7c5e74ff /perl-install/any.pm | |
| parent | 397d7519660822e04173c29f36fc2b754ae956d7 (diff) | |
| download | drakx-backup-do-not-use-8d83d221ffdc569ea1914de43d1641131459faa4.tar drakx-backup-do-not-use-8d83d221ffdc569ea1914de43d1641131459faa4.tar.gz drakx-backup-do-not-use-8d83d221ffdc569ea1914de43d1641131459faa4.tar.bz2 drakx-backup-do-not-use-8d83d221ffdc569ea1914de43d1641131459faa4.tar.xz drakx-backup-do-not-use-8d83d221ffdc569ea1914de43d1641131459faa4.zip | |
Merge from AMD64 branch: lib64 fixes
Diffstat (limited to 'perl-install/any.pm')
| -rw-r--r-- | perl-install/any.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index c1ea5301d..773c31fdf 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -510,8 +510,8 @@ sub writeandclean_ldsoconf { my ($prefix) = @_; my $file = "$prefix/etc/ld.so.conf"; output $file, - grep { !m|^(/usr)?/lib$| } #- no need to have /lib and /usr/lib in ld.so.conf - uniq cat_($file), "/usr/X11R6/lib\n"; + 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"); } sub shells() { |