From 29aa6cb44af758d884b9fc1938c8ee61c9643b32 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@mandriva.com>
Date: Thu, 22 Oct 2009 16:27:58 +0000
Subject: - fix input module path on 64 bit machines - don't install input
 drivers if X isn't here

---
 lib/mouse.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/mouse.pm b/lib/mouse.pm
index bbfc29e..4167df7 100644
--- a/lib/mouse.pm
+++ b/lib/mouse.pm
@@ -14,6 +14,7 @@ use devices;
 use modules;
 use any;
 use log;
+use Xconfig::card;
 
 sub _all_mice() {
  arch() =~ /^sparc/ ? 
@@ -383,8 +384,11 @@ sub various_xfree_conf {
 	    output_with_perm($f, 0755, "xset m 1/8 1\n");
 	}
     }
-  
-    my $inputdrvpath = '/usr/lib/xorg/modules/input';
+
+    if (! -e "/usr/bin/X") {
+	return;
+    }
+    my $inputdrvpath = Xconfig::card::modules_dir() . '/input';
     my $pkgs = [
 	if_($mouse->{synaptics}, ['x11-driver-input-synaptics', "$inputdrvpath/synaptics_drv.so"]),
 	if_($mouse->{evdev_mice}, ['x11-driver-input-evdev', "$inputdrvpath/evdev_drv.so"]),
-- 
cgit v1.2.1