branch to build the firewall install.topic/unlabeled-1.1.1

1 files changed, 5 insertions, 4 deletions

diff --git a/perl-install/share/keymaps_generate b/perl-install/share/keymaps_generate
index 29fd576fb..a2c461fb6 100755
--- a/perl-install/share/keymaps_generate
+++ b/perl-install/share/keymaps_generate
@@ -3,15 +3,16 @@
 use lib "..";
 use keyboard;
 
-system("rm -rf keymaps ; mkdir keymaps");
+my $dir = "keymaps/usr/share/keymaps";
+system("rm -rf keymaps ; mkdir -p keymaps/usr/share/keymaps");
 
 foreach (keyboard::xmodmaps()) {
     my $kmap = keyboard::keyboard2kmap($_);
-    if (system("./kmap2bkmap $kmap > keymaps/$kmap.bkmap 2>/dev/null") != 0) {
+    if (system("./kmap2bkmap $kmap > $dir/$kmap.bkmap 2>/dev/null") != 0) {
 	warn "unknown kmap $kmap\n";
-	unlink "keymaps/$kmap.bkmap";
+	unlink "$dir/$kmap.bkmap";
     }
 }
 
-system("tar cfI keymaps.tar.bz2 keymaps") == 0 or die;
+system("tar cfI keymaps.tar.bz2 -C keymaps usr") == 0 or die;
 system("rm -rf keymaps");