From ffca7332b6138a49762a10e80809dbbb9368aa85 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 17 Jun 2004 07:46:13 +0000 Subject: (install_server) remove proprietary gl libraries when configuring a non ATI/NVIDIA card and redo ldconfig cache accordingly --- perl-install/Xconfig/card.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'perl-install/Xconfig') diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm index ee467fcd5..8e47b3205 100644 --- a/perl-install/Xconfig/card.pm +++ b/perl-install/Xconfig/card.pm @@ -387,9 +387,11 @@ sub install_server { if (my $file = $driver_to_libgl_config{$card->{Driver2}}) { if (-e $file) { symlinkf($file, "/etc/ld.so.conf.d/GL.conf"); - system("/sbin/ldconfig") if $::isStandalone } + } else { + eval { rm_rf("/etc/ld.so.conf.d/GL.conf") }; } + 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") { -- cgit v1.2.1