diff options
| author | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-10-07 08:43:19 +0000 |
|---|---|---|
| committer | Gwenolé Beauchesne <gbeauchesne@mandriva.org> | 2003-10-07 08:43:19 +0000 |
| commit | d18281fdff869ba6f4b006c47905283120ccc449 (patch) | |
| tree | c8132679e6768eddb3e17d9f630eef833f03c009 | |
| parent | 5f984b7ffff24247886c9775f597936db90d620b (diff) | |
| download | drakx-backup-do-not-use-d18281fdff869ba6f4b006c47905283120ccc449.tar drakx-backup-do-not-use-d18281fdff869ba6f4b006c47905283120ccc449.tar.gz drakx-backup-do-not-use-d18281fdff869ba6f4b006c47905283120ccc449.tar.bz2 drakx-backup-do-not-use-d18281fdff869ba6f4b006c47905283120ccc449.tar.xz drakx-backup-do-not-use-d18281fdff869ba6f4b006c47905283120ccc449.zip | |
lib64 fixes for proprietary modules (mainly nvidia)
| -rw-r--r-- | perl-install/Xconfig/card.pm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm index 3a5f9cd9b..652460a20 100644 --- a/perl-install/Xconfig/card.pm +++ b/perl-install/Xconfig/card.pm @@ -9,6 +9,7 @@ use common; use log; +my $lib = (arch() =~ /x86_64/) ? "lib64" : "lib"; my $force_xf4 = arch() =~ /ppc|ia64|x86_64/; @@ -117,7 +118,7 @@ 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}); $raw_X->{xfree4}->remove_Section('DRI'); $raw_X->{xfree4}->add_Section('DRI', { Mode => { val => '0666' } }) if $card->{use_DRI_GLX}; @@ -352,15 +353,15 @@ 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" && - -e "$::prefix/usr/X11R6/lib/modules/extensions/libglx.so") { + -e "$::prefix/usr/X11R6/$lib/modules/drivers/nvidia_drv.o" && + -e "$::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; } 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'; } |