commit - a2ebd7683c28a034c854e0dbae155343ab2fb22e
commit + a6096b50e13d889da7ae7ea40d02c29f5c2d0a4f
blob - 636db83b5bebeb9063bf19d3c1d024019ff25aaa
blob + ab84c6180497292ec928aad2b5ecd8ebe5ca47ad
--- utils/kbd/kbd-hell.patch
+++ utils/kbd/kbd-hell.patch
@@ -60,52 +60,6 @@ index 8cd3610..4f47af4 100644
  	rm -f $(DESTDIR)$(datadir)/$(KEYMAPDIR)/ppc
  	$(LN_S) mac $(DESTDIR)$(datadir)/$(KEYMAPDIR)/ppc
  	@if [ -f $(DESTDIR)$(datadir)/$(OLDKEYMAPDIR) ]; then \
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 8635299..c1dd1ac 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -39,7 +39,11 @@ spawn_console_CFLAGS = -DSPAWN_CONSOLE
- spawn_login_CFLAGS   = -DSPAWN_LOGIN
- 
- COMMON_LIBS = \
--	libcommon/libcommon.a \
-+	$(top_builddir)/src/libcommon/libcommon.a \
-+	$(ZLIB_LIBS) \
-+	$(BZIP2_LIBS) \
-+	$(LZMA_LIBS) \
-+	$(ZSTD_LIBS) \
- 	@INTLLIBS@
- 
- chvt_LDADD            = $(COMMON_LIBS)
-@@ -63,18 +67,18 @@ spawn_console_LDADD   = $(COMMON_LIBS)
- spawn_login_LDADD     = $(COMMON_LIBS)
- outpsfheader_LDADD    = $(COMMON_LIBS)
- 
--resizecons_LDADD      = libkbdfile/libkbdfile.la $(COMMON_LIBS)
-+resizecons_LDADD      = $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
- 
--clrunimap_LDADD       = libkfont/libkfont.la $(COMMON_LIBS)
--getunimap_LDADD       = libkfont/libkfont.la $(COMMON_LIBS)
--loadunimap_LDADD      = libkfont/libkfont.la $(COMMON_LIBS)
--mapscrn_LDADD         = libkfont/libkfont.la $(COMMON_LIBS)
--psfxtable_LDADD       = libkfont/libkfont.la $(COMMON_LIBS)
--setfont_LDADD         = libkfont/libkfont.la $(COMMON_LIBS)
--showconsolefont_LDADD = libkfont/libkfont.la $(COMMON_LIBS)
-+clrunimap_LDADD       = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
-+getunimap_LDADD       = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
-+loadunimap_LDADD      = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
-+mapscrn_LDADD         = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
-+psfxtable_LDADD       = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
-+setfont_LDADD         = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
-+showconsolefont_LDADD = $(top_builddir)/src/libkfont/libkfont.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
- 
--dumpkeys_LDADD        = libkeymap/libkeymap.la libkbdfile/libkbdfile.la $(COMMON_LIBS)
--loadkeys_LDADD        = libkeymap/libkeymap.la libkbdfile/libkbdfile.la $(COMMON_LIBS)
-+dumpkeys_LDADD        = $(top_builddir)/src/libkeymap/libkeymap.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
-+loadkeys_LDADD        = $(top_builddir)/src/libkeymap/libkeymap.a $(top_builddir)/src/libkbdfile/libkbdfile.a $(COMMON_LIBS)
- 
- install-exec-hook:
- 	for i in psfaddtable psfgettable psfstriptable; do \
 diff --git a/src/libkbdfile/Makefile.am b/src/libkbdfile/Makefile.am
 index 2511064..ef15113 100644
 --- a/src/libkbdfile/Makefile.am
@@ -122,7 +76,7 @@ index 2511064..ef15113 100644