Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=630d2ddef3a2a41bdb5a1062032fcce0aa5ef846
commit 630d2ddef3a2a41bdb5a1062032fcce0aa5ef846
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Wed Mar 26 21:21:42 2008 +0100
fix up for kbd 1.14.1
diff --git a/Makefile b/Makefile
index 0bf7620..84e6492 100644
--- a/Makefile
+++ b/Makefile
@@ -272,14 +272,14 @@ glibc:
kbd:
$(CLEANUP)
- mkdir -p kbd/usr/{bin,share/kbd/keymaps,share/kbd/consolefonts}
+ mkdir -p kbd/usr/{bin,share/keymaps,share/consolefonts}
$(UNPACK)
- cp -a $(BDIR)/{bin/loadkeys,usr/bin/setfont,usr/bin/kbd_mode}
kbd/usr/bin/
- cp -a $(BDIR)/usr/share/kbd/keymaps/{i386,include} \
- kbd/usr/share/kbd/keymaps/
+ cp -a $(BDIR)/usr/bin/{loadkeys,setfont,kbd_mode} kbd/usr/bin/
+ cp -a $(BDIR)/usr/share/keymaps/{i386,include} \
+ kbd/usr/share/keymaps/
for i in $(fonts); do \
- cp -a $(BDIR)/usr/share/kbd/consolefonts/$$i \
- kbd/usr/share/kbd/consolefonts/; \
+ cp -a $(BDIR)/usr/share/consolefonts/$$i \
+ kbd/usr/share/consolefonts/; \
done
kernel:
diff --git a/src/plugins/layout.c b/src/plugins/layout.c
index e2cd06f..1ba8003 100644
--- a/src/plugins/layout.c
+++ b/src/plugins/layout.c
@@ -101,7 +101,7 @@ int run(GList **config)
FILE* fp;
int ret = 0;
- find("/usr/share/kbd/keymaps/i386");
+ find("/usr/share/keymaps/i386");
layoutl = g_list_sort(layoutl, sort_layouts);
array = glist4dialog(layoutl, "");
@@ -109,7 +109,7 @@ int run(GList **config)
dlg_put_backtitle();
dlg_clear();
/* this string should be the best keyboard layout for the given
- * language from /usr/share/kbd/keymaps/i386 */
+ * language from /usr/share/keymaps/i386 */
dialog_vars.default_item=strdup(_("qwerty/us.map.gz"));
if(fw_menu(_("Keyboard map selection"),
_("You may select one of the following keyboard maps. If you "
@@ -130,7 +130,7 @@ int run(GList **config)
//TODO: maybe there is a proper system call for this?
LOG("selected layout '%s'", layout);
- ptr = g_strdup_printf("loadkeys /usr/share/kbd/keymaps/i386/%s.map.gz",
layout);
+ ptr = g_strdup_printf("loadkeys /usr/share/keymaps/i386/%s.map.gz",
layout);
fw_system(ptr);
FREE(ptr);
@@ -143,7 +143,7 @@ int run(GList **config)
}
fprintf(fp, "# /etc/sysconfig/keymap\n\n"
"# specify the keyboard map, maps are in "
- "/usr/share/kbd/keymaps\n\n");
+ "/usr/share/keymaps\n\n");
if(strstr(layout, "/"))
fprintf(fp, "keymap=%s\n", strstr(layout, "/")+1);
FREE(layout);
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
