From 0e5ce0bd2918097956890801e33e32d8711fa4b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= <gbeauchesne@mandriva.org>
Date: Wed, 25 Aug 2004 05:23:12 +0000
Subject: handle lib64 drivers on x86-64

---
 perl-install/Xconfig/card.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index b5117fa4e..c926f4551 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -57,6 +57,7 @@ my @xfree4_Drivers = ((arch() =~ /^sparc/ ? qw(sunbw2 suncg14 suncg3 suncg6 sunf
                        s3 s3virge savage siliconmotion sis tdfx tga trident tseng vmware)), 
 		    qw(ati glint vga fbdev));
 
+my $lib = (arch() =~ /x86_64/) ? "lib64" : "lib";
 
 #- using XF4 if {Driver} && !{prefer_xf3} otherwise using XF3
 #- error if $force_xf4 && !{Driver} || !{Driver} && !{server}
@@ -117,9 +118,9 @@ sub to_raw_X {
     # This loads the NVIDIA GLX extension module.
     # IT IS IMPORTANT TO KEEP NAME AS FULL PATH TO libglx.so ELSE
     # IT WILL LOAD XFree86 glx module and the server will crash.
-    $raw_X->{xfree4}->set_load_module('/usr/X11R6/lib/modules/extensions/libglx.so', $card->{DRI_GLX_SPECIAL}); 
+    $raw_X->{xfree4}->set_load_module("/usr/X11R6/$lib/modules/extensions/libglx.so", $card->{DRI_GLX_SPECIAL}); 
     if ($card->{Driver2} ne 'nvidia') {
-        $raw_X->{xfree4}->set_load_module('/usr/X11R6/lib/modules/extensions/libglx.a', 1);
+        $raw_X->{xfree4}->set_load_module("/usr/X11R6/$lib/modules/extensions/libglx.a", 1);
     }
 
     $raw_X->{xfree4}->remove_Section('DRI');
@@ -373,8 +374,8 @@ sub install_server {
     #- make sure everything is correct at this point, packages have really been installed
     #- and driver and GLX extension is present.
     if ($card->{Driver2} eq 'nvidia' &&
-	-e "$::prefix/usr/X11R6/lib/modules/drivers/nvidia_drv.o" &&
-	-l "$::prefix/usr/X11R6/lib/modules/extensions/libglx.so") {
+	-e "$::prefix/usr/X11R6/$lib/modules/drivers/nvidia_drv.o" &&
+	-l "$::prefix/usr/X11R6/$lib/modules/extensions/libglx.so") {
 	log::l("Using specific NVIDIA driver and GLX extensions");
 	$card->{Driver} = 'nvidia';
 	$card->{DRI_GLX_SPECIAL} = 1;
@@ -393,8 +394,8 @@ sub install_server {
     }
     system("/sbin/ldconfig") if $::isStandalone;
     if ($card->{Driver2} eq 'fglrx' &&
-	-e "$::prefix/usr/X11R6/lib/modules/dri/fglrx_dri.so" &&
-	-e "$::prefix/usr/X11R6/lib/modules/drivers/fglrx_drv.o") {
+	-e "$::prefix/usr/X11R6/$lib/modules/dri/fglrx_dri.so" &&
+	-e "$::prefix/usr/X11R6/$lib/modules/drivers/fglrx_drv.o") {
 	log::l("Using specific ATI fglrx and DRI drivers");
 	$card->{Driver} = 'fglrx';
     }
-- 
cgit v1.2.1