From 8d83d221ffdc569ea1914de43d1641131459faa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= <gbeauchesne@mandriva.org>
Date: Tue, 19 Aug 2003 16:44:57 +0000
Subject: Merge from AMD64 branch: lib64 fixes

---
 perl-install/any.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/any.pm')

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() {
-- 
cgit v1.2.1