summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-10-22 16:27:58 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-10-22 16:27:58 +0000
commit29aa6cb44af758d884b9fc1938c8ee61c9643b32 (patch)
treefac77a453aaef9d2f38b06564ad62ffacfd8401e /lib
parent3f2fbbfaf2e023a9b0bb00faf5164bfa45169d4d (diff)
downloaddrakx-kbd-mouse-x11-29aa6cb44af758d884b9fc1938c8ee61c9643b32.tar
drakx-kbd-mouse-x11-29aa6cb44af758d884b9fc1938c8ee61c9643b32.tar.gz
drakx-kbd-mouse-x11-29aa6cb44af758d884b9fc1938c8ee61c9643b32.tar.bz2
drakx-kbd-mouse-x11-29aa6cb44af758d884b9fc1938c8ee61c9643b32.tar.xz
drakx-kbd-mouse-x11-29aa6cb44af758d884b9fc1938c8ee61c9643b32.zip
- fix input module path on 64 bit machines
- don't install input drivers if X isn't here
Diffstat (limited to 'lib')
-rw-r--r--lib/mouse.pm8
1 files changed, 6 insertions, 2 deletions
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"]),