From fd82c0312a315599fb0d766fa5c6b7be4b211ba3 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 10 Sep 1999 09:15:24 +0000
Subject: no_comment

---
 perl-install/keyboard.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'perl-install/keyboard.pm')

diff --git a/perl-install/keyboard.pm b/perl-install/keyboard.pm
index baad33b74..fdd821465 100644
--- a/perl-install/keyboard.pm
+++ b/perl-install/keyboard.pm
@@ -9,6 +9,7 @@ use strict;
 #-######################################################################################
 use common qw(:common :system :file);
 use run_program;
+use install_any;
 use log;
 use c;
 
@@ -116,12 +117,13 @@ sub setup($) {
     my ($keyboard) = @_;
     my $o = $keyboards{$keyboard} or return;
 
-    my $file = "/usr/share/keymaps/$o->[1].kmap";
-    if (-e $file) {
+    if (my $file = install_any::install_cpio("/usr/share/keymaps", "$o->[1].kmap")) {
 	log::l("loading keymap $o->[1]");
 	load(cat_($file));
     }
-    eval { run_program::run('xmodmap', "/usr/share/xmodmap/xmodmap.$o->[2]") } unless $::testing;
+    if (my $file = install_any::install_cpio("/usr/share/xmodmap", "xmodmap.$o->[2]")) {
+	eval { run_program::run('xmodmap', $file) } unless $::testing;
+    }
 }
 
 sub write($$) {
-- 
cgit v1.2.1