pyrox.dev
1diff -ru3 kbd-2.0.3-old/src/libkeymap/analyze.l kbd-2.0.3/src/libkeymap/analyze.l
2--- kbd-2.0.3-old/src/libkeymap/analyze.l 2016-07-03 02:31:28.258958092 +0300
3+++ kbd-2.0.3/src/libkeymap/analyze.l 2016-07-03 02:44:53.042592223 +0300
4@@ -99,6 +99,9 @@
5 static const char *const include_dirpath0[] = { "", 0 };
6 static const char *const include_dirpath1[] = { "", "../include/", "../../include/", 0 };
7 static const char *const include_dirpath3[] = {
8+ "/etc/kbd/" KEYMAPDIR "/include/",
9+ "/etc/kbd/" KEYMAPDIR "/i386/include/",
10+ "/etc/kbd/" KEYMAPDIR "/mac/include/",
11 DATADIR "/" KEYMAPDIR "/include/",
12 DATADIR "/" KEYMAPDIR "/i386/include/",
13 DATADIR "/" KEYMAPDIR "/mac/include/", 0
14diff -ru3 kbd-2.0.3-old/src/loadkeys.c kbd-2.0.3/src/loadkeys.c
15--- kbd-2.0.3-old/src/loadkeys.c 2016-07-03 02:31:28.260958091 +0300
16+++ kbd-2.0.3/src/loadkeys.c 2016-07-03 02:34:34.123871103 +0300
17@@ -26,7 +26,7 @@
18 #include "keymap.h"
19
20 static const char *progname = NULL;
21-static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 };
22+static const char *const dirpath1[] = { "", "/etc/kbd/" KEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", 0 };
23 static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
24
25 static void __attribute__ ((noreturn))
26diff -ru3 kbd-2.0.3-old/src/loadunimap.c kbd-2.0.3/src/loadunimap.c
27--- kbd-2.0.3-old/src/loadunimap.c 2016-07-03 02:31:28.259958091 +0300
28+++ kbd-2.0.3/src/loadunimap.c 2016-07-03 02:33:06.803911971 +0300
29@@ -28,7 +28,7 @@
30 extern char *progname;
31 extern int force;
32
33-static const char *const unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 };
34+static const char *const unidirpath[] = { "", "/etc/kbd/" UNIMAPDIR "/", DATADIR "/" UNIMAPDIR "/", 0 };
35 static const char *const unisuffixes[] = { "", ".uni", ".sfm", 0 };
36
37 #ifdef MAIN
38diff -ru3 kbd-2.0.3-old/src/mapscrn.c kbd-2.0.3/src/mapscrn.c
39--- kbd-2.0.3-old/src/mapscrn.c 2016-07-03 02:31:28.260958091 +0300
40+++ kbd-2.0.3/src/mapscrn.c 2016-07-03 02:33:21.119905270 +0300
41@@ -25,7 +25,7 @@
42 static int ctoi (char *);
43
44 /* search for the map file in these directories (with trailing /) */
45-static const char *const mapdirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 };
46+static const char *const mapdirpath[] = { "", "/etc/kbd/" TRANSDIR "/", DATADIR "/" TRANSDIR "/", 0 };
47 static const char *const mapsuffixes[] = { "", ".trans", "_to_uni.trans", ".acm", 0 };
48
49 #ifdef MAIN
50diff -ru3 kbd-2.0.3-old/src/resizecons.c kbd-2.0.3/src/resizecons.c
51--- kbd-2.0.3-old/src/resizecons.c 2016-07-03 02:31:28.260958091 +0300
52+++ kbd-2.0.3/src/resizecons.c 2016-07-03 02:33:32.253900060 +0300
53@@ -100,7 +100,7 @@
54 static void vga_set_cursor(int, int);
55 static void vga_set_verticaldisplayend_lowbyte(int);
56
57-const char *const dirpath[] = { "", DATADIR "/" VIDEOMODEDIR "/", 0};
58+const char *const dirpath[] = { "", "/etc/kbd/" VIDEOMODEDIR "/", DATADIR "/" VIDEOMODEDIR "/", 0};
59 const char *const suffixes[] = { "", 0 };
60
61 int
62diff -ru3 kbd-2.0.3-old/src/setfont.c kbd-2.0.3/src/setfont.c
63--- kbd-2.0.3-old/src/setfont.c 2016-07-03 02:31:28.260958091 +0300
64+++ kbd-2.0.3/src/setfont.c 2016-07-03 02:33:54.315889734 +0300
65@@ -51,10 +51,10 @@
66 int debug = 0;
67
68 /* search for the font in these directories (with trailing /) */
69-const char *const fontdirpath[] = { "", DATADIR "/" FONTDIR "/", 0 };
70+const char *const fontdirpath[] = { "", "/etc/kbd/" FONTDIR "/", DATADIR "/" FONTDIR "/", 0 };
71 const char *const fontsuffixes[] = { "", ".psfu", ".psf", ".cp", ".fnt", 0 };
72 /* hide partial fonts a bit - loading a single one is a bad idea */
73-const char *const partfontdirpath[] = { "", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 };
74+const char *const partfontdirpath[] = { "", "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 };
75 const char *const partfontsuffixes[] = { "", 0 };
76
77 static inline int