From 7852f18586352b52a5ffd8892c1c4f25cf60b745 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Mon, 12 Dec 2011 19:54:50 +0000
Subject: (may_use_Driver2) simplify

---
 lib/Xconfig/proprietary.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'lib/Xconfig')

diff --git a/lib/Xconfig/proprietary.pm b/lib/Xconfig/proprietary.pm
index 756387c..fba7854 100644
--- a/lib/Xconfig/proprietary.pm
+++ b/lib/Xconfig/proprietary.pm
@@ -99,9 +99,8 @@ sub may_use_Driver2 {
 	$card2;
     } elsif ($card2->{Driver} eq 'fglrx') {
 	$check_drv->('fglrx_drv', "fglrx$card2->{DriverVersion}") or return;
-	-e "$::prefix/usr/$lib/fglrx$card2->{DriverVersion}/dri/fglrx_dri.so" ||
-	  -e "$::prefix$modules_dir/dri/fglrx_dri.so" ||
-	  -e "$::prefix/usr/$lib/dri/fglrx_dri.so" or
+        find { -e "$::prefix/$_/dri/fglrx_dri.so" } (
+            "/usr/$lib/fglrx$card2->{DriverVersion}", $modules_dir, "/usr/$lib") or
 	  log::l("proprietary fglrx_dri.so missing"), return;
 
 	log::explanations("Using specific ATI fglrx and DRI drivers");
-- 
cgit v1.2.1