Update to libX11 1.3.6.

Tested by ajacoutot@, jasper@ and krw@.

93 files changed, 352 insertions, 562 deletions

diff --git a/lib/libX11/ChangeLog b/lib/libX11/ChangeLog
index 50182e764..cab331950 100644
--- a/lib/libX11/ChangeLog
+++ b/lib/libX11/ChangeLog
@@ -1,3 +1,81 @@
+commit 7f5a8fac9ca8b4e90b1feea43cd562265837ed4c
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Mon Sep 20 16:04:42 2010 +1000
+
+    libX11 1.3.6
+    
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 6838a5beeb6c6c614e371fe7df5fa7804065e55e
+Author: Jens Petersen <petersen@redhat.com>
+Date:   Mon Aug 23 18:08:10 2010 -0700
+
+    Bug 29773: aliases for nb_NO.utf8 and nn_NO.utf8
+    
+    <https://bugs.freedesktop.org/show_bug.cgi?id=29773>
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e90ec71b870ac15f52e41162e61974d16b63d3a2
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Fri Jul 9 18:13:13 2010 +0100
+
+    XStringToKeysym: Cope with 0x1234cafe-style input
+    
+    If we get input in the style of 0xdeadbeef, just return that exact
+    keysym.  Introduces a dependency on strtoul, which I'm told is OK on all
+    the systems we care about.
+    
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+
+commit b3ff091678e900128f209b9d64bfac36228a355b
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jul 8 16:49:51 2010 +0100
+
+    XStringToKeysym: Check strdup() return value
+    
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+    Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 50b4b07073bd46cbef3627c160a240bd2a2b99d5
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Jun 15 18:49:43 2010 +0100
+
+    Delete now-redundant XKeysymDB
+    
+    Since XStringToKeysym now supports all the vendor keysyms, just delete
+    our XKeysymDB, which was incomplete at best, misleading at worst, and
+    always an annoyance.
+    
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit a32370c0854c8ad6f526dd997f14dbe3f466d4db
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Jun 15 18:48:48 2010 +0100
+
+    makekeys: Scan vendor keysyms as well as core
+    
+    Since we can't really live without vendor keysyms, scan them all in to
+    generate ks_tables.h, rather than only doing the core ones, and leaving
+    the vendor syms to be manually synchronised with XKeysymDB.
+    
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 77cb2bda308b39dc0a8267f18d92e7b4bf178aa1
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Tue Jun 15 18:47:37 2010 +0100
+
+    XStringToKeysym: Special case for XF86 keysyms
+    
+    Some XFree86 keysyms were in XKeysymDB as XF86_foo, despite really being
+    XF86foo.  So, if we get to the bottom of XStringToKeysym and haven't
+    found our XF86_foo, try it again as XF86foo.
+    
+    Signed-off-by: Daniel Stone <daniel@fooishbar.org>
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
 commit 8e3877aa50f3092c8fdfd916b072720439bc818b
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Wed Aug 11 16:24:28 2010 -0700
@@ -217,7 +295,7 @@ Date:   Wed May 12 16:42:18 2010 -0700
     Reviewed-by: Jamey Sharp <jamey@minilop.net>
 
 commit fd82552d5c0ce1931f29006a0c36f5e03cf8577e
-Merge: aae2a4a... 933aee1...
+Merge: aae2a4a 933aee1
 Author: Jamey Sharp <jamey@minilop.net>
 Date:   Mon May 10 16:51:24 2010 -0700
 
@@ -2913,7 +2991,7 @@ Date:   Tue Jun 10 20:07:30 2008 +0300
     Add some Khmer digraphs to all locales with a Compose.pre.
 
 commit e54cffb649b1622c17457e470cfab8cc56d38c97
-Merge: 19802cc... 721b574...
+Merge: 19802cc 721b574
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Tue Jun 10 20:04:30 2008 +0300
 
@@ -2932,7 +3010,7 @@ Date:   Wed May 28 17:31:59 2008 +0930
     Require xproto 7.0.13 and libxcb 1.1.90 (for GenericEvents)
 
 commit e9195db7257e418f83707233baeeb84b225caf4f
-Merge: c34f76f... a7f8556...
+Merge: c34f76f a7f8556
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Thu May 22 12:14:28 2008 +0930
 
@@ -2968,7 +3046,7 @@ Date:   Mon May 12 21:46:24 2008 +0930
     Build with xcb as transport layer highly recommended.
 
 commit c9b2ff1e6a607463993afa4a8d085857d97cc2f3
-Merge: 17d7dcb... 9129057...
+Merge: 17d7dcb 9129057
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Mon May 12 17:58:37 2008 +0930
 
@@ -3175,7 +3253,7 @@ Date:   Sat Dec 22 21:45:23 2007 +0100
     X.Org bug#13786 <http://bugs.freedesktop.org/show_bug.cgi?id=13786>
 
 commit 32115c563b87d2f37e3f9de70fbd0f4d9e424aea
-Merge: 8f0bd3f... e8d4cef...
+Merge: 8f0bd3f e8d4cef
 Author: James Cloos <cloos@jhcloos.com>
 Date:   Fri Dec 14 22:43:47 2007 -0500
 
@@ -3206,14 +3284,14 @@ Date:   Mon Dec 10 23:00:44 2007 -0800
     Added launchd support.
 
 commit 17d7dcbfced4a9417b33507bd3fd9b7dd8268242
-Merge: 5dfefd3... 13ac804...
+Merge: 5dfefd3 13ac804
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Thu Dec 6 14:08:29 2007 +1030
 
     Merge branch 'master' into xge
 
 commit 5dfefd3829d3ba7e41d5db0ad28e9dfee92fadd5
-Merge: a68a1cd... eff33ae...
+Merge: a68a1cd eff33ae
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Thu Dec 6 13:57:09 2007 +1030
 
@@ -3269,7 +3347,7 @@ Date:   Tue Dec 4 17:25:39 2007 -0500
     2] https://bugs.freedesktop.org/show_bug.cgi?id=5129
 
 commit 02e04059c89e175f51647e3b031344f743286b34
-Merge: 1254c57... b57129e...
+Merge: 1254c57 b57129e
 Author: James Cloos <cloos@jhcloos.com>
 Date:   Tue Dec 4 06:55:04 2007 -0500
 
@@ -3447,7 +3525,7 @@ Date:   Tue Jan 2 08:40:00 2007 -0800
     X.Org Bugzilla #9516 <https://bugs.freedesktop.org/show_bug.cgi?id=9516>
 
 commit d8fe979fc929833e8c754aed32641786d5a0622b
-Merge: 21ca953... 4ec1723...
+Merge: 21ca953 4ec1723
 Author: James Cloos <cloos@jhcloos.com>
 Date:   Mon Aug 20 15:34:50 2007 -0400
 
@@ -4067,7 +4145,7 @@ Date:   Sat Dec 16 00:45:19 2006 +0200
     Since XlibConf.h is built by configure, don't distribute it.
 
 commit dd1705ced2cac6b4b6b21e79272fcf9bed4bf376
-Merge: 129bbb9... 769b985...
+Merge: 129bbb9 769b985
 Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
 Date:   Thu Dec 14 14:23:20 2006 -0600
 
@@ -4307,7 +4385,7 @@ Date:   Sat Oct 7 21:00:36 2006 -0700
     Release libX11 1.1 RC1 (1.0.99.1).
 
 commit bf237409c5fce32c557d298f62f44d456c2b5bc8
-Merge: ba47719... 2d426d1...
+Merge: ba47719 2d426d1
 Author: Jamey Sharp <jamey@minilop.net>
 Date:   Sat Oct 7 21:07:16 2006 -0700
 
@@ -4744,7 +4822,7 @@ Date:   Sat Jun 3 13:51:51 2006 +0300
     (cherry picked from e3acee88cfcc4ef0fa8a7db39763a5ebe2e985cb commit)
 
 commit c336eb6b80a6f91da1d0b3d28634a2cfde324670
-Merge: 33556ca... ad9ebbd...
+Merge: 33556ca ad9ebbd
 Author: Donnie Berkholz <donnie@comet.(none)>
 Date:   Thu Jun 22 14:25:35 2006 -0700
 
@@ -4757,14 +4835,14 @@ Date:   Thu Jun 22 17:20:59 2006 +0300
     Bump to 1.0.99.0 to avoid confusion.
 
 commit efedfd68e31bcee2d21ac340be8dc9e1825ec890
-Merge: e3acee8... 4b8eb5d...
+Merge: e3acee8 4b8eb5d
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Thu Jun 22 16:53:45 2006 +0300
 
     Merge branch 'master' of git+ssh://git.freedesktop.org/srv/git.freedesktop.org/git/xorg/lib/libX11
 
 commit 4b8eb5d4a1da73a94b5a6ab12e34784aae4c79c5
-Merge: 5169d0e... eff50c9...
+Merge: 5169d0e eff50c9
 Author: Matthieu Herrb <matthieu@deville.herrb.com>
 Date:   Tue Jun 20 21:05:15 2006 +0200
 
@@ -5097,7 +5175,7 @@ Date:   Wed May 10 14:51:37 2006 +0300
     Fix typo (be_BG.UTF-8 rather than bg_BG.UTF-8) in locale.alias.pre.
 
 commit 9cac8c9824874ca7d835f001a4efa910b7fdd822
-Merge: 19b8840... e514bc8...
+Merge: 19b8840 e514bc8
 Author: Daniel Stone <daniels@preemptive.fooishbar.org>
 Date:   Wed May 10 14:50:37 2006 +0300
 
@@ -5190,7 +5268,7 @@ Date:   Fri Mar 17 15:58:39 2006 +0200
     Properly clip bounds when only one point is defining an outline.
 
 commit e876efb8aa410f2f5c87aaaa7042f847c4ff96f7
-Merge: be266b2... f71ea0b...
+Merge: be266b2 f71ea0b
 Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
 Date:   Sat Mar 11 15:40:35 2006 +0100
 
diff --git a/lib/libX11/Makefile.in b/lib/libX11/Makefile.in
index 7dba695b9..825dfab87 100644
--- a/lib/libX11/Makefile.in
+++ b/lib/libX11/Makefile.in
@@ -156,7 +156,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/configure b/lib/libX11/configure
index d8b3258d2..657b992c7 100644
--- a/lib/libX11/configure
+++ b/lib/libX11/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for libX11 1.3.5.
+# Generated by GNU Autoconf 2.62 for libX11 1.3.6.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libX11'
 PACKAGE_TARNAME='libX11'
-PACKAGE_VERSION='1.3.5'
-PACKAGE_STRING='libX11 1.3.5'
+PACKAGE_VERSION='1.3.6'
+PACKAGE_STRING='libX11 1.3.6'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file="Makefile.am"
@@ -961,7 +961,7 @@ THRSTUBS_TRUE
 THRSTUBS_FALSE
 XTHREADLIB
 XTHREAD_CFLAGS
-KEYSYMDEF
+KEYSYMDEFS
 UDC_TRUE
 UDC_FALSE
 XCMS_TRUE
@@ -1617,7 +1617,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libX11 1.3.5 to adapt to many kinds of systems.
+\`configure' configures libX11 1.3.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1687,7 +1687,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libX11 1.3.5:";;
+     short | recursive ) echo "Configuration of libX11 1.3.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1849,7 +1849,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libX11 configure 1.3.5
+libX11 configure 1.3.6
 generated by GNU Autoconf 2.62
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1863,7 +1863,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libX11 $as_me 1.3.5, which was
+It was created by libX11 $as_me 1.3.6, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   $ $0 $@
@@ -2598,7 +2598,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libX11'
- VERSION='1.3.5'
+ VERSION='1.3.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -25984,18 +25984,21 @@ fi
 #
 # Find keysymdef.h
 #
-{ $as_echo "$as_me:$LINENO: checking keysymdef.h" >&5
-$as_echo_n "checking keysymdef.h... " >&6; }
-dir=`$PKG_CONFIG --variable=includedir xproto`
-KEYSYMDEF="$dir/X11/keysymdef.h"
-if test -f "$KEYSYMDEF"; then
-        { $as_echo "$as_me:$LINENO: result: $KEYSYMDEF" >&5
-$as_echo "$KEYSYMDEF" >&6; }
-else
-	{ { $as_echo "$as_me:$LINENO: error: Cannot find keysymdef.h" >&5
+{ $as_echo "$as_me:$LINENO: checking keysym definitions" >&5
+$as_echo_n "checking keysym definitions... " >&6; }
+KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
+FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
+for i in $FILES; do
+    if test -f "$KEYSYMDEFDIR/$i"; then
+            KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i"
+    elif test "x$i" = "xkeysymdef.h"; then
+	    { { $as_echo "$as_me:$LINENO: error: Cannot find keysymdef.h" >&5
 $as_echo "$as_me: error: Cannot find keysymdef.h" >&2;}
    { (exit 1); exit 1; }; }
-fi
+    fi
+done
+{ $as_echo "$as_me:$LINENO: result: $KEYSYMDEFS" >&5
+$as_echo "$KEYSYMDEFS" >&6; }
 
 
 
@@ -27846,7 +27849,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libX11 $as_me 1.3.5, which was
+This file was extended by libX11 $as_me 1.3.6, which was
 generated by GNU Autoconf 2.62.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -27899,7 +27902,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-libX11 config.status 1.3.5
+libX11 config.status 1.3.6
 configured by $0, generated by GNU Autoconf 2.62,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/lib/libX11/configure.ac b/lib/libX11/configure.ac
index 449af55f0..65422c8ef 100644
--- a/lib/libX11/configure.ac
+++ b/lib/libX11/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.60)
 AC_INIT([libX11],
-        [1.3.5],
+        [1.3.6],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         libX11)
 AC_CONFIG_SRCDIR([Makefile.am])
@@ -354,15 +354,18 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
 #
 # Find keysymdef.h
 #
-AC_MSG_CHECKING([keysymdef.h])
-dir=`$PKG_CONFIG --variable=includedir xproto`
-KEYSYMDEF="$dir/X11/keysymdef.h"
-if test -f "$KEYSYMDEF"; then
-        AC_MSG_RESULT([$KEYSYMDEF])
-else
-	AC_MSG_ERROR([Cannot find keysymdef.h])
-fi
-AC_SUBST(KEYSYMDEF)
+AC_MSG_CHECKING([keysym definitions])
+KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
+FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
+for i in $FILES; do
+    if test -f "$KEYSYMDEFDIR/$i"; then
+            KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i"
+    elif test "x$i" = "xkeysymdef.h"; then
+	    AC_MSG_ERROR([Cannot find keysymdef.h])
+    fi
+done
+AC_MSG_RESULT([$KEYSYMDEFS])
+AC_SUBST(KEYSYMDEFS)
 
 AM_CONDITIONAL(UDC, test xfalse = xtrue)
 
diff --git a/lib/libX11/include/Makefile.in b/lib/libX11/include/Makefile.in
index 2725c3ada..38ddd0027 100644
--- a/lib/libX11/include/Makefile.in
+++ b/lib/libX11/include/Makefile.in
@@ -138,7 +138,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/man/Makefile.in b/lib/libX11/man/Makefile.in
index acf03748d..37ca96819 100644
--- a/lib/libX11/man/Makefile.in
+++ b/lib/libX11/man/Makefile.in
@@ -147,7 +147,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/man/xkb/Makefile.in b/lib/libX11/man/xkb/Makefile.in
index 455f3bb78..512ac7594 100644
--- a/lib/libX11/man/xkb/Makefile.in
+++ b/lib/libX11/man/xkb/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/modules/Makefile.in b/lib/libX11/modules/Makefile.in
index 050433081..5e183f390 100644
--- a/lib/libX11/modules/Makefile.in
+++ b/lib/libX11/modules/Makefile.in
@@ -128,7 +128,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/modules/im/Makefile.in b/lib/libX11/modules/im/Makefile.in
index 1928e95ad..0489e1ada 100644
--- a/lib/libX11/modules/im/Makefile.in
+++ b/lib/libX11/modules/im/Makefile.in
@@ -128,7 +128,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/modules/im/ximcp/Makefile.in b/lib/libX11/modules/im/ximcp/Makefile.in
index fb915f1bb..c4b225121 100644
--- a/lib/libX11/modules/im/ximcp/Makefile.in
+++ b/lib/libX11/modules/im/ximcp/Makefile.in
@@ -160,7 +160,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/modules/lc/Makefile.in b/lib/libX11/modules/lc/Makefile.in
index af0d28a2e..420dc71f2 100644
--- a/lib/libX11/modules/lc/Makefile.in
+++ b/lib/libX11/modules/lc/Makefile.in
@@ -128,7 +128,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/modules/lc/Utf8/Makefile.in b/lib/libX11/modules/lc/Utf8/Makefile.in
index 694223e99..f96f4a265 100644
--- a/lib/libX11/modules/lc/Utf8/Makefile.in
+++ b/lib/libX11/modules/lc/Utf8/Makefile.in
@@ -151,7 +151,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/modules/lc/def/Makefile.in b/lib/libX11/modules/lc/def/Makefile.in
index 52f2738c7..8367fc564 100644
--- a/lib/libX11/modules/lc/def/Makefile.in
+++ b/lib/libX11/modules/lc/def/Makefile.in
@@ -150,7 +150,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/modules/lc/gen/Makefile.in b/lib/libX11/modules/lc/gen/Makefile.in
index 7723d5701..baecfc950 100644
--- a/lib/libX11/modules/lc/gen/Makefile.in
+++ b/lib/libX11/modules/lc/gen/Makefile.in
@@ -150,7 +150,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/modules/lc/gen/lcGenConv.c b/lib/libX11/modules/lc/gen/lcGenConv.c
index 074a8d726..4f26cb86c 100644
--- a/lib/libX11/modules/lc/gen/lcGenConv.c
+++ b/lib/libX11/modules/lc/gen/lcGenConv.c
@@ -764,8 +764,10 @@ mbstowcs_org(
         return( 0 );
     }
 
+#ifdef notdef
     if (*from_left > *to_left)
         *from_left = *to_left;
+#endif
 
     while (*from_left && *to_left) {
 
@@ -921,8 +923,10 @@ wcstombs_org(
     int defstr_len = strlen(default_string);
 
 
+#ifdef notdef
     if (*from_left > *to_left)
         *from_left = *to_left;
+#endif
 
     while (*from_left && *to_left) {
 
@@ -1080,8 +1084,10 @@ wcstocts(
     int from_size = *from_left;
     char *ext_seg_len = NULL;
 
+#ifdef notdef
     if (*from_left > *to_left)
         *from_left = *to_left;
+#endif
 
     while (*from_left && *to_left) {
 
@@ -1272,8 +1278,10 @@ ctstowcs(
         return( 0 );
     }
 
+#ifdef notdef
     if (*from_left > *to_left)
         *from_left = *to_left;
+#endif
 
     while (*from_left && *to_left) {
 
@@ -1666,8 +1674,10 @@ mbstostr(
         return( 0 );
     }
 
+#ifdef notdef
     if (*from_left > *to_left)
         *from_left = *to_left;
+#endif
 
     while (*from_left && *to_left) {
 
@@ -1784,8 +1794,10 @@ mbtocs(
         return( 0 );
     }
 
+#ifdef notdef
     if (*from_left > *to_left)
         *from_left = *to_left;
+#endif
 
     while (*from_left && *to_left) {
 
@@ -1960,8 +1972,10 @@ wcstostr(
     int defstr_len = strlen(default_string);
 
 
+#ifdef notdef
     if (*from_left > *to_left)
         *from_left = *to_left;
+#endif
 
     while (*from_left && *to_left) {
 
@@ -2117,8 +2131,10 @@ wctocs(
     char *outbufptr = *to;
     int from_size = *from_left;
 
+#ifdef notdef
     if (*from_left > *to_left)
         *from_left = *to_left;
+#endif
 
     if (*from_left && *to_left) {
 
@@ -2430,8 +2446,10 @@ strtombs(
     char *outbufptr = *to;
     int from_size = *from_left;
 
+#ifdef notdef
     if (*from_left > *to_left)
         *from_left = *to_left;
+#endif
 
     while (*from_left && *to_left) {
 
@@ -2540,8 +2558,10 @@ strtowcs(
     wchar_t *outbufptr = (wchar_t *)*to;
     int from_size = *from_left;
 
+#ifdef notdef
     if (*from_left > *to_left)
         *from_left = *to_left;
+#endif
 
     while (*from_left && *to_left) {
 
diff --git a/lib/libX11/modules/lc/xlocale/Makefile.in b/lib/libX11/modules/lc/xlocale/Makefile.in
index 94310c94e..35d8f3f1f 100644
--- a/lib/libX11/modules/lc/xlocale/Makefile.in
+++ b/lib/libX11/modules/lc/xlocale/Makefile.in
@@ -150,7 +150,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/modules/om/Makefile.in b/lib/libX11/modules/om/Makefile.in
index ba7c5bd73..23ef8fb0a 100644
--- a/lib/libX11/modules/om/Makefile.in
+++ b/lib/libX11/modules/om/Makefile.in
@@ -128,7 +128,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/modules/om/generic/Makefile.in b/lib/libX11/modules/om/generic/Makefile.in
index 30dcaab96..f33f3f8b7 100644
--- a/lib/libX11/modules/om/generic/Makefile.in
+++ b/lib/libX11/modules/om/generic/Makefile.in
@@ -153,7 +153,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/C/Makefile.in b/lib/libX11/nls/C/Makefile.in
index f6e896a83..a4f589a39 100644
--- a/lib/libX11/nls/C/Makefile.in
+++ b/lib/libX11/nls/C/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/Makefile.in b/lib/libX11/nls/Makefile.in
index 6e739afd4..d10ec8f5b 100644
--- a/lib/libX11/nls/Makefile.in
+++ b/lib/libX11/nls/Makefile.in
@@ -143,7 +143,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/am_ET.UTF-8/Makefile.in b/lib/libX11/nls/am_ET.UTF-8/Makefile.in
index abfc99561..5c4992abb 100644
--- a/lib/libX11/nls/am_ET.UTF-8/Makefile.in
+++ b/lib/libX11/nls/am_ET.UTF-8/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/armscii-8/Makefile.in b/lib/libX11/nls/armscii-8/Makefile.in
index 6a79d18b1..3e0e031e3 100644
--- a/lib/libX11/nls/armscii-8/Makefile.in
+++ b/lib/libX11/nls/armscii-8/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/el_GR.UTF-8/Makefile.in b/lib/libX11/nls/el_GR.UTF-8/Makefile.in
index dfa12fd48..706c2933f 100644
--- a/lib/libX11/nls/el_GR.UTF-8/Makefile.in
+++ b/lib/libX11/nls/el_GR.UTF-8/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/en_US.UTF-8/Makefile.in b/lib/libX11/nls/en_US.UTF-8/Makefile.in
index e31819f83..b4f406d53 100644
--- a/lib/libX11/nls/en_US.UTF-8/Makefile.in
+++ b/lib/libX11/nls/en_US.UTF-8/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/fi_FI.UTF-8/Makefile.in b/lib/libX11/nls/fi_FI.UTF-8/Makefile.in
index ba037cc31..29e783c70 100644
--- a/lib/libX11/nls/fi_FI.UTF-8/Makefile.in
+++ b/lib/libX11/nls/fi_FI.UTF-8/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/georgian-academy/Makefile.in b/lib/libX11/nls/georgian-academy/Makefile.in
index e4224a037..4cb82936c 100644
--- a/lib/libX11/nls/georgian-academy/Makefile.in
+++ b/lib/libX11/nls/georgian-academy/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/georgian-ps/Makefile.in b/lib/libX11/nls/georgian-ps/Makefile.in
index 84885caba..674375af6 100644
--- a/lib/libX11/nls/georgian-ps/Makefile.in
+++ b/lib/libX11/nls/georgian-ps/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/ibm-cp1133/Makefile.in b/lib/libX11/nls/ibm-cp1133/Makefile.in
index 061a860ac..07779e0e9 100644
--- a/lib/libX11/nls/ibm-cp1133/Makefile.in
+++ b/lib/libX11/nls/ibm-cp1133/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/iscii-dev/Makefile.in b/lib/libX11/nls/iscii-dev/Makefile.in
index 086f0a526..f0cdacb1f 100644
--- a/lib/libX11/nls/iscii-dev/Makefile.in
+++ b/lib/libX11/nls/iscii-dev/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/isiri-3342/Makefile.in b/lib/libX11/nls/isiri-3342/Makefile.in
index 80d7c97be..78753a18e 100644
--- a/lib/libX11/nls/isiri-3342/Makefile.in
+++ b/lib/libX11/nls/isiri-3342/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/iso8859-1/Makefile.in b/lib/libX11/nls/iso8859-1/Makefile.in
index 84269d7a2..5bf7ad452 100644
--- a/lib/libX11/nls/iso8859-1/Makefile.in
+++ b/lib/libX11/nls/iso8859-1/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/iso8859-10/Makefile.in b/lib/libX11/nls/iso8859-10/Makefile.in
index 44487b01b..6758eb6d7 100644
--- a/lib/libX11/nls/iso8859-10/Makefile.in
+++ b/lib/libX11/nls/iso8859-10/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/iso8859-11/Makefile.in b/lib/libX11/nls/iso8859-11/Makefile.in
index dfa3078a2..3d7f8693e 100644
--- a/lib/libX11/nls/iso8859-11/Makefile.in
+++ b/lib/libX11/nls/iso8859-11/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/iso8859-13/Makefile.in b/lib/libX11/nls/iso8859-13/Makefile.in
index 6dc07e4bc..1ff5a1173 100644
--- a/lib/libX11/nls/iso8859-13/Makefile.in
+++ b/lib/libX11/nls/iso8859-13/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/iso8859-14/Makefile.in b/lib/libX11/nls/iso8859-14/Makefile.in
index d10195688..8e9f9a6e0 100644
--- a/lib/libX11/nls/iso8859-14/Makefile.in
+++ b/lib/libX11/nls/iso8859-14/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/iso8859-15/Makefile.in b/lib/libX11/nls/iso8859-15/Makefile.in
index 6b2afe739..7c9e4c332 100644
--- a/lib/libX11/nls/iso8859-15/Makefile.in
+++ b/lib/libX11/nls/iso8859-15/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/iso8859-2/Makefile.in b/lib/libX11/nls/iso8859-2/Makefile.in
index a43561700..806764f5e 100644
--- a/lib/libX11/nls/iso8859-2/Makefile.in
+++ b/lib/libX11/nls/iso8859-2/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/iso8859-3/Makefile.in b/lib/libX11/nls/iso8859-3/Makefile.in
index c343be500..6d1e0871f 100644
--- a/lib/libX11/nls/iso8859-3/Makefile.in
+++ b/lib/libX11/nls/iso8859-3/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/iso8859-4/Makefile.in b/lib/libX11/nls/iso8859-4/Makefile.in
index 48b9150bf..6c0f6adf3 100644
--- a/lib/libX11/nls/iso8859-4/Makefile.in
+++ b/lib/libX11/nls/iso8859-4/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/iso8859-5/Makefile.in b/lib/libX11/nls/iso8859-5/Makefile.in
index 1044d998f..9553e6fa1 100644
--- a/lib/libX11/nls/iso8859-5/Makefile.in
+++ b/lib/libX11/nls/iso8859-5/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/iso8859-6/Makefile.in b/lib/libX11/nls/iso8859-6/Makefile.in
index a6a5f9cc2..c1ec9ef2f 100644
--- a/lib/libX11/nls/iso8859-6/Makefile.in
+++ b/lib/libX11/nls/iso8859-6/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/iso8859-7/Makefile.in b/lib/libX11/nls/iso8859-7/Makefile.in
index 454d4369f..8f67cfac4 100644
--- a/lib/libX11/nls/iso8859-7/Makefile.in
+++ b/lib/libX11/nls/iso8859-7/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/iso8859-8/Makefile.in b/lib/libX11/nls/iso8859-8/Makefile.in
index 274ae482b..afd07cd4b 100644
--- a/lib/libX11/nls/iso8859-8/Makefile.in
+++ b/lib/libX11/nls/iso8859-8/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/iso8859-9/Makefile.in b/lib/libX11/nls/iso8859-9/Makefile.in
index e4354c55b..cb5fe74d3 100644
--- a/lib/libX11/nls/iso8859-9/Makefile.in
+++ b/lib/libX11/nls/iso8859-9/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/iso8859-9e/Makefile.in b/lib/libX11/nls/iso8859-9e/Makefile.in
index a5537afc0..2e4b53a4e 100644
--- a/lib/libX11/nls/iso8859-9e/Makefile.in
+++ b/lib/libX11/nls/iso8859-9e/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/ja.JIS/Makefile.in b/lib/libX11/nls/ja.JIS/Makefile.in
index 7895a6c89..a5f5171d6 100644
--- a/lib/libX11/nls/ja.JIS/Makefile.in
+++ b/lib/libX11/nls/ja.JIS/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/ja.S90/Makefile.in b/lib/libX11/nls/ja.S90/Makefile.in
index 556f9c94e..655d104c2 100644
--- a/lib/libX11/nls/ja.S90/Makefile.in
+++ b/lib/libX11/nls/ja.S90/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/ja.SJIS/Makefile.in b/lib/libX11/nls/ja.SJIS/Makefile.in
index 1eec0ad06..b9c092ff4 100644
--- a/lib/libX11/nls/ja.SJIS/Makefile.in
+++ b/lib/libX11/nls/ja.SJIS/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/ja.U90/Makefile.in b/lib/libX11/nls/ja.U90/Makefile.in
index 571e876f6..037846282 100644
--- a/lib/libX11/nls/ja.U90/Makefile.in
+++ b/lib/libX11/nls/ja.U90/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/ja/Makefile.in b/lib/libX11/nls/ja/Makefile.in
index 33a2de67c..03267a034 100644
--- a/lib/libX11/nls/ja/Makefile.in
+++ b/lib/libX11/nls/ja/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/ja_JP.UTF-8/Makefile.in b/lib/libX11/nls/ja_JP.UTF-8/Makefile.in
index e91e53e5d..dbe61fdfd 100644
--- a/lib/libX11/nls/ja_JP.UTF-8/Makefile.in
+++ b/lib/libX11/nls/ja_JP.UTF-8/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/ko/Makefile.in b/lib/libX11/nls/ko/Makefile.in
index 9b248d811..c90148d55 100644
--- a/lib/libX11/nls/ko/Makefile.in
+++ b/lib/libX11/nls/ko/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/ko_KR.UTF-8/Makefile.in b/lib/libX11/nls/ko_KR.UTF-8/Makefile.in
index dc2222122..798558b58 100644
--- a/lib/libX11/nls/ko_KR.UTF-8/Makefile.in
+++ b/lib/libX11/nls/ko_KR.UTF-8/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/koi8-c/Makefile.in b/lib/libX11/nls/koi8-c/Makefile.in
index 20dc9ca7d..8a7b8ff54 100644
--- a/lib/libX11/nls/koi8-c/Makefile.in
+++ b/lib/libX11/nls/koi8-c/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/koi8-r/Makefile.in b/lib/libX11/nls/koi8-r/Makefile.in
index 9a6288500..5ce4d56d5 100644
--- a/lib/libX11/nls/koi8-r/Makefile.in
+++ b/lib/libX11/nls/koi8-r/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/koi8-u/Makefile.in b/lib/libX11/nls/koi8-u/Makefile.in
index 9ab168a6e..3414bd6cb 100644
--- a/lib/libX11/nls/koi8-u/Makefile.in
+++ b/lib/libX11/nls/koi8-u/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/locale.alias.pre b/lib/libX11/nls/locale.alias.pre
index 0e18868a6..3064827d1 100644
--- a/lib/libX11/nls/locale.alias.pre
+++ b/lib/libX11/nls/locale.alias.pre
@@ -821,6 +821,7 @@ nb_NO.iso88591:					nb_NO.ISO8859-1
 nb_NO.ISO-8859-1:				nb_NO.ISO8859-1
 nb_NO.iso885915:				nb_NO.ISO8859-15
 nb_NO.ISO-8859-15:				nb_NO.ISO8859-15
+nb_NO.utf8:					nb_NO.UTF-8
 ne_NP.utf8:					ne_NP.UTF-8
 ne_NP.UTF-8:					ne_NP.UTF-8
 nl:						nl_NL.ISO8859-1
@@ -856,6 +857,7 @@ nn_NO.ISO-8859-1:				nn_NO.ISO8859-1
 nn_NO.ISO_8859-1:				nn_NO.ISO8859-1
 nn_NO.iso885915:				nn_NO.ISO8859-15
 nn_NO.ISO-8859-15:				nn_NO.ISO8859-15
+nn_NO.utf8:					nn_NO.UTF-8
 no:						no_NO.ISO8859-1
 no_NO:						no_NO.ISO8859-1
 no_NO.88591:					no_NO.ISO8859-1
diff --git a/lib/libX11/nls/microsoft-cp1251/Makefile.in b/lib/libX11/nls/microsoft-cp1251/Makefile.in
index 44ff09e8c..379c8d379 100644
--- a/lib/libX11/nls/microsoft-cp1251/Makefile.in
+++ b/lib/libX11/nls/microsoft-cp1251/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/microsoft-cp1255/Makefile.in b/lib/libX11/nls/microsoft-cp1255/Makefile.in
index 57c4c663e..dd5359ac8 100644
--- a/lib/libX11/nls/microsoft-cp1255/Makefile.in
+++ b/lib/libX11/nls/microsoft-cp1255/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/microsoft-cp1256/Makefile.in b/lib/libX11/nls/microsoft-cp1256/Makefile.in
index 71d28148b..4ed763fdd 100644
--- a/lib/libX11/nls/microsoft-cp1256/Makefile.in
+++ b/lib/libX11/nls/microsoft-cp1256/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/mulelao-1/Makefile.in b/lib/libX11/nls/mulelao-1/Makefile.in
index 580a0901e..851ef7951 100644
--- a/lib/libX11/nls/mulelao-1/Makefile.in
+++ b/lib/libX11/nls/mulelao-1/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/nokhchi-1/Makefile.in b/lib/libX11/nls/nokhchi-1/Makefile.in
index 4eb6568d1..497164150 100644
--- a/lib/libX11/nls/nokhchi-1/Makefile.in
+++ b/lib/libX11/nls/nokhchi-1/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/pt_BR.UTF-8/Makefile.in b/lib/libX11/nls/pt_BR.UTF-8/Makefile.in
index 1dbfe2bbe..d8b931d7c 100644
--- a/lib/libX11/nls/pt_BR.UTF-8/Makefile.in
+++ b/lib/libX11/nls/pt_BR.UTF-8/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/ru_RU.UTF-8/Makefile.in b/lib/libX11/nls/ru_RU.UTF-8/Makefile.in
index 4f1a7459f..fbfa09c36 100644
--- a/lib/libX11/nls/ru_RU.UTF-8/Makefile.in
+++ b/lib/libX11/nls/ru_RU.UTF-8/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/tatar-cyr/Makefile.in b/lib/libX11/nls/tatar-cyr/Makefile.in
index e3a1e8731..35212dd6a 100644
--- a/lib/libX11/nls/tatar-cyr/Makefile.in
+++ b/lib/libX11/nls/tatar-cyr/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/th_TH.UTF-8/Makefile.in b/lib/libX11/nls/th_TH.UTF-8/Makefile.in
index 2a880f214..aafd86003 100644
--- a/lib/libX11/nls/th_TH.UTF-8/Makefile.in
+++ b/lib/libX11/nls/th_TH.UTF-8/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/th_TH/Makefile.in b/lib/libX11/nls/th_TH/Makefile.in
index b2bf77abb..28ccdf2c3 100644
--- a/lib/libX11/nls/th_TH/Makefile.in
+++ b/lib/libX11/nls/th_TH/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/tscii-0/Makefile.in b/lib/libX11/nls/tscii-0/Makefile.in
index afa33ad2e..78356dee2 100644
--- a/lib/libX11/nls/tscii-0/Makefile.in
+++ b/lib/libX11/nls/tscii-0/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/vi_VN.tcvn/Makefile.in b/lib/libX11/nls/vi_VN.tcvn/Makefile.in
index 9ca6585cd..a06912dd0 100644
--- a/lib/libX11/nls/vi_VN.tcvn/Makefile.in
+++ b/lib/libX11/nls/vi_VN.tcvn/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/vi_VN.viscii/Makefile.in b/lib/libX11/nls/vi_VN.viscii/Makefile.in
index 9db8475e5..e055cb6be 100644
--- a/lib/libX11/nls/vi_VN.viscii/Makefile.in
+++ b/lib/libX11/nls/vi_VN.viscii/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/zh_CN.UTF-8/Makefile.in b/lib/libX11/nls/zh_CN.UTF-8/Makefile.in
index 60a504269..da51d5e53 100644
--- a/lib/libX11/nls/zh_CN.UTF-8/Makefile.in
+++ b/lib/libX11/nls/zh_CN.UTF-8/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/zh_CN.gb18030/Makefile.in b/lib/libX11/nls/zh_CN.gb18030/Makefile.in
index 11f931a4b..1490a1787 100644
--- a/lib/libX11/nls/zh_CN.gb18030/Makefile.in
+++ b/lib/libX11/nls/zh_CN.gb18030/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/zh_CN.gbk/Makefile.in b/lib/libX11/nls/zh_CN.gbk/Makefile.in
index c2957c497..3d327b9a9 100644
--- a/lib/libX11/nls/zh_CN.gbk/Makefile.in
+++ b/lib/libX11/nls/zh_CN.gbk/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/zh_CN/Makefile.in b/lib/libX11/nls/zh_CN/Makefile.in
index 9db698a73..2f97b2bd2 100644
--- a/lib/libX11/nls/zh_CN/Makefile.in
+++ b/lib/libX11/nls/zh_CN/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/zh_HK.UTF-8/Makefile.in b/lib/libX11/nls/zh_HK.UTF-8/Makefile.in
index bad9e764c..e88af0d5b 100644
--- a/lib/libX11/nls/zh_HK.UTF-8/Makefile.in
+++ b/lib/libX11/nls/zh_HK.UTF-8/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/zh_HK.big5/Makefile.in b/lib/libX11/nls/zh_HK.big5/Makefile.in
index 7adb11155..84032491b 100644
--- a/lib/libX11/nls/zh_HK.big5/Makefile.in
+++ b/lib/libX11/nls/zh_HK.big5/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/zh_HK.big5hkscs/Makefile.in b/lib/libX11/nls/zh_HK.big5hkscs/Makefile.in
index ccb8b32a4..f1ed3be66 100644
--- a/lib/libX11/nls/zh_HK.big5hkscs/Makefile.in
+++ b/lib/libX11/nls/zh_HK.big5hkscs/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/zh_TW.UTF-8/Makefile.in b/lib/libX11/nls/zh_TW.UTF-8/Makefile.in
index 3acd53703..357d7c1aa 100644
--- a/lib/libX11/nls/zh_TW.UTF-8/Makefile.in
+++ b/lib/libX11/nls/zh_TW.UTF-8/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/zh_TW.big5/Makefile.in b/lib/libX11/nls/zh_TW.big5/Makefile.in
index bc29b9577..415b6a323 100644
--- a/lib/libX11/nls/zh_TW.big5/Makefile.in
+++ b/lib/libX11/nls/zh_TW.big5/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/nls/zh_TW/Makefile.in b/lib/libX11/nls/zh_TW/Makefile.in
index a00aab168..396053542 100644
--- a/lib/libX11/nls/zh_TW/Makefile.in
+++ b/lib/libX11/nls/zh_TW/Makefile.in
@@ -137,7 +137,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/specs/Makefile.in b/lib/libX11/specs/Makefile.in
index ea99d42f5..1a361919c 100644
--- a/lib/libX11/specs/Makefile.in
+++ b/lib/libX11/specs/Makefile.in
@@ -128,7 +128,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/specs/XIM/Makefile.in b/lib/libX11/specs/XIM/Makefile.in
index e776f5ef2..01ffd0dea 100644
--- a/lib/libX11/specs/XIM/Makefile.in
+++ b/lib/libX11/specs/XIM/Makefile.in
@@ -180,7 +180,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/specs/i18n/Makefile.in b/lib/libX11/specs/i18n/Makefile.in
index 9c97e1eb1..bd05fd033 100644
--- a/lib/libX11/specs/i18n/Makefile.in
+++ b/lib/libX11/specs/i18n/Makefile.in
@@ -180,7 +180,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/specs/libX11/Makefile.in b/lib/libX11/specs/libX11/Makefile.in
index ae139df8b..13c323c31 100644
--- a/lib/libX11/specs/libX11/Makefile.in
+++ b/lib/libX11/specs/libX11/Makefile.in
@@ -180,7 +180,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/src/Makefile.am b/lib/libX11/src/Makefile.am
index 256e6f157..826b97831 100644
--- a/lib/libX11/src/Makefile.am
+++ b/lib/libX11/src/Makefile.am
@@ -339,7 +339,7 @@ libX11_la_SOURCES+=UIThrStubs.c
 endif
 
 x11datadir = @X11_DATADIR@
-x11data_DATA = XKeysymDB XErrorDB
+x11data_DATA = XErrorDB
 
 EXTRA_DIST = \
 	$(x11data_DATA) \
@@ -425,10 +425,10 @@ endif MAKE_LINT_LIB
 # Building ks_tables.h requires the makekeys utility
 #
 
-KEYSYMDEF=@KEYSYMDEF@
+KEYSYMDEFS=@KEYSYMDEFS@
 
-ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)
-	$(top_builddir)/src/util/makekeys < $(KEYSYMDEF) > ks_tables_h
+ks_tables.h: $(KEYSYMDEFS) $(top_builddir)/src/util/makekeys$(EXEEXT)
+	$(top_builddir)/src/util/makekeys $(KEYSYMDEFS) > ks_tables_h
 	mv ks_tables_h $@
 
 $(top_builddir)/src/util/makekeys$(EXEEXT): force
diff --git a/lib/libX11/src/Makefile.in b/lib/libX11/src/Makefile.in
index d8262d183..412fc8f74 100644
--- a/lib/libX11/src/Makefile.in
+++ b/lib/libX11/src/Makefile.in
@@ -301,7 +301,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 #
 # Building ks_tables.h requires the makekeys utility
 #
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
@@ -537,7 +537,7 @@ libX11_la_SOURCES = AllCells.c AllowEv.c AllPlanes.c AutoRep.c \
 	Xresinternal.h Xrm.c XrmI.h $(am__append_1) $(am__append_2) \
 	$(am__append_3) $(am__append_4) $(am__append_6)
 x11datadir = @X11_DATADIR@
-x11data_DATA = XKeysymDB XErrorDB
+x11data_DATA = XErrorDB
 EXTRA_DIST = \
 	$(x11data_DATA) \
 	os2Stubs.c \
@@ -1288,8 +1288,8 @@ preprocess: $(patsubst %.c,%.ii,$(libX11_la_SOURCES))
 @MAKE_LINT_LIB_TRUE@$(LINTLIB): $(libX11_la_SOURCES)
 @MAKE_LINT_LIB_TRUE@	$(AM_V_GEN)$(LINT) -y -oX11 -x $(ALL_LINT_FLAGS) $(lintlib_src)
 
-ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)
-	$(top_builddir)/src/util/makekeys < $(KEYSYMDEF) > ks_tables_h
+ks_tables.h: $(KEYSYMDEFS) $(top_builddir)/src/util/makekeys$(EXEEXT)
+	$(top_builddir)/src/util/makekeys $(KEYSYMDEFS) > ks_tables_h
 	mv ks_tables_h $@
 
 $(top_builddir)/src/util/makekeys$(EXEEXT): force
diff --git a/lib/libX11/src/StrKeysym.c b/lib/libX11/src/StrKeysym.c
index fb507458f..4394e0cd2 100644
--- a/lib/libX11/src/StrKeysym.c
+++ b/lib/libX11/src/StrKeysym.c
@@ -27,6 +27,7 @@ in this Software without prior written authorization from The Open Group.
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
+#include <limits.h>
 #include "Xlibint.h"
 #include <X11/Xresource.h>
 #include <X11/keysymdef.h>
@@ -152,5 +153,29 @@ XStringToKeysym(_Xconst char *s)
 	    return val;
         return val | 0x01000000;
     }
+
+    if (strlen(s) > 2 && s[0] == '0' && s[1] == 'x') {
+        char *tmp = NULL;
+        val = strtoul(s, &tmp, 16);
+        if (val == ULONG_MAX || (tmp && *tmp != '\0'))
+            return NoSymbol;
+        else
+            return val;
+    }
+
+    /* Stupid inconsistency between the headers and XKeysymDB: the former has
+     * no separating underscore, while some XF86* syms in the latter did.
+     * As a last ditch effort, try without. */
+    if (strncmp(s, "XF86_", 5) == 0) {
+        KeySym ret;
+        char *tmp = strdup(s);
+        if (!tmp)
+            return NoSymbol;
+        memmove(&tmp[4], &tmp[5], strlen(s) - 5 + 1);
+        ret = XStringToKeysym(tmp);
+        free(tmp);
+        return ret;
+    }
+
     return NoSymbol;
 }
diff --git a/lib/libX11/src/XKeysymDB b/lib/libX11/src/XKeysymDB
deleted file mode 100644
index 45d892971..000000000
--- a/lib/libX11/src/XKeysymDB
+++ /dev/null
@@ -1,380 +0,0 @@
-! Copyright 1993 Massachusetts Institute of Technology
-!
-! Permission to use, copy, modify, distribute, and sell this software and
-! its documentation for any purpose is hereby granted without fee, provided
-! that the above copyright notice appear in all copies and that both that
-! copyright notice and this permission notice appear in supporting
-! documentation, and that the name of M.I.T. not be used in advertising or
-! publicity pertaining to distribution of the software without specific,
-! written prior permission.  M.I.T. makes no representations about the
-! suitability of this software for any purpose.  It is provided "as is"
-! without express or implied warranty.
-!
-
-hpmute_acute		:100000A8
-hpmute_grave		:100000A9
-hpmute_asciicircum	:100000AA
-hpmute_diaeresis	:100000AB
-hpmute_asciitilde	:100000AC
-hplira			:100000AF
-hpguilder		:100000BE
-hpYdiaeresis		:100000EE
-hpIO			:100000EE
-hplongminus		:100000F6
-hpblock			:100000FC
-apLineDel		:1000FF00
-apCharDel		:1000FF01
-apCopy			:1000FF02
-apCut			:1000FF03
-apPaste			:1000FF04
-apMove			:1000FF05
-apGrow			:1000FF06
-apCmd			:1000FF07
-apShell			:1000FF08
-apLeftBar		:1000FF09
-apRightBar		:1000FF0A
-apLeftBox		:1000FF0B
-apRightBox		:1000FF0C
-apUpBox			:1000FF0D
-apDownBox		:1000FF0E
-apPop			:1000FF0F
-apRead			:1000FF10
-apEdit			:1000FF11
-apSave			:1000FF12
-apExit			:1000FF13
-apRepeat		:1000FF14
-hpModelock1		:1000FF48
-hpModelock2		:1000FF49
-hpReset			:1000FF6C
-hpSystem		:1000FF6D
-hpUser			:1000FF6E
-hpClearLine		:1000FF6F
-hpInsertLine		:1000FF70
-hpDeleteLine		:1000FF71
-hpInsertChar		:1000FF72
-hpDeleteChar		:1000FF73
-hpBackTab		:1000FF74
-hpKP_BackTab		:1000FF75
-apKP_parenleft		:1000FFA8
-apKP_parenright		:1000FFA9
-
-I2ND_FUNC_L		:10004001
-I2ND_FUNC_R		:10004002
-IREMOVE			:10004003
-IREPEAT			:10004004
-IA1			:10004101
-IA2			:10004102
-IA3			:10004103
-IA4			:10004104
-IA5			:10004105
-IA6			:10004106
-IA7			:10004107
-IA8			:10004108
-IA9			:10004109
-IA10			:1000410A
-IA11			:1000410B
-IA12			:1000410C
-IA13			:1000410D
-IA14			:1000410E
-IA15			:1000410F
-IB1			:10004201
-IB2			:10004202
-IB3			:10004203
-IB4			:10004204
-IB5			:10004205
-IB6			:10004206
-IB7			:10004207
-IB8			:10004208
-IB9			:10004209
-IB10			:1000420A
-IB11			:1000420B
-IB12			:1000420C
-IB13			:1000420D
-IB14			:1000420E
-IB15			:1000420F
-IB16			:10004210
-
-DRemove			:1000FF00
-Dring_accent		:1000FEB0
-Dcircumflex_accent	:1000FE5E
-Dcedilla_accent		:1000FE2C
-Dacute_accent		:1000FE27
-Dgrave_accent		:1000FE60
-Dtilde			:1000FE7E
-Ddiaeresis		:1000FE22
-
-osfCopy			:1004FF02
-osfCut			:1004FF03
-osfPaste		:1004FF04
-osfBackTab		:1004FF07
-osfBackSpace		:1004FF08
-osfClear		:1004FF0B
-osfEscape		:1004FF1B
-osfAddMode		:1004FF31
-osfPrimaryPaste		:1004FF32
-osfQuickPaste		:1004FF33
-osfPageLeft		:1004FF40
-osfPageUp		:1004FF41
-osfPageDown		:1004FF42
-osfPageRight		:1004FF43
-osfActivate		:1004FF44
-osfMenuBar		:1004FF45
-osfLeft			:1004FF51
-osfUp			:1004FF52
-osfRight		:1004FF53
-osfDown			:1004FF54
-osfPrior		:1004FF55
-osfNext			:1004FF56
-osfEndLine		:1004FF57
-osfBeginLine		:1004FF58
-osfEndData		:1004FF59
-osfBeginData		:1004FF5A
-osfPrevMenu		:1004FF5B
-osfNextMenu		:1004FF5C
-osfPrevField		:1004FF5D
-osfNextField		:1004FF5E
-osfSelect		:1004FF60
-osfInsert		:1004FF63
-osfUndo			:1004FF65
-osfMenu			:1004FF67
-osfCancel		:1004FF69
-osfHelp			:1004FF6A
-osfSelectAll		:1004FF71
-osfDeselectAll		:1004FF72
-osfReselect		:1004FF73
-osfExtend		:1004FF74
-osfRestore		:1004FF78
-osfSwitchDirection	:1004FF7E
-osfPriorMinor		:1004FFF5
-osfNextMinor		:1004FFF6
-osfRightLine		:1004FFF7
-osfLeftLine		:1004FFF8
-osfDelete		:1004FFFF
-
-SunFA_Grave		:1005FF00
-SunFA_Circum		:1005FF01
-SunFA_Tilde		:1005FF02
-SunFA_Acute		:1005FF03
-SunFA_Diaeresis		:1005FF04
-SunFA_Cedilla		:1005FF05
-SunF36			:1005FF10
-SunF37			:1005FF11
-SunSys_Req		:1005FF60
-SunProps		:1005FF70
-SunFront		:1005FF71
-SunCopy			:1005FF72
-SunOpen			:1005FF73
-SunPaste		:1005FF74
-SunCut			:1005FF75
-SunPowerSwitch		:1005FF76
-SunAudioLowerVolume	:1005FF77
-SunAudioMute		:1005FF78
-SunAudioRaiseVolume	:1005FF79
-SunVideoDegauss		:1005FF7A
-SunVideoLowerBrightness	:1005FF7B
-SunVideoRaiseBrightness	:1005FF7C
-SunPowerSwitchShift	:1005FF7D
-
-SunCompose		:FF20
-SunPageUp		:FF55
-SunPageDown		:FF56
-SunPrint_Screen		:FF61
-SunUndo			:FF65
-SunAgain		:FF66
-SunFind			:FF68
-SunStop			:FF69
-SunAltGraph		:FF7E
-
-WYSetup			:1006FF00
-
-ncdSetup		:1006FF00
-
-XeroxPointerButton1	:10070001
-XeroxPointerButton2	:10070002
-XeroxPointerButton3	:10070003
-XeroxPointerButton4	:10070004
-XeroxPointerButton5	:10070005
-
-! The definitions here should match <X11/XF86keysym.h>
-XF86ModeLock		:1008FF01
-XF86MonBrightnessUp	:1008FF02
-XF86MonBrightnessDown	:1008FF03
-XF86KbdLightOnOff	:1008FF04
-XF86KbdBrightnessUp	:1008FF05
-XF86KbdBrightnessDown	:1008FF06
-XF86Standby		:1008FF10
-XF86AudioLowerVolume	:1008FF11
-XF86AudioMute		:1008FF12
-XF86AudioRaiseVolume	:1008FF13
-XF86AudioPlay		:1008FF14
-XF86AudioStop		:1008FF15
-XF86AudioPrev		:1008FF16
-XF86AudioNext		:1008FF17
-XF86HomePage		:1008FF18
-XF86Mail		:1008FF19
-XF86Start		:1008FF1A
-XF86Search		:1008FF1B
-XF86AudioRecord		:1008FF1C
-XF86Calculator		:1008FF1D
-XF86Memo		:1008FF1E
-XF86ToDoList		:1008FF1F
-XF86Calendar		:1008FF20
-XF86PowerDown		:1008FF21
-XF86ContrastAdjust	:1008FF22
-XF86RockerUp		:1008FF23
-XF86RockerDown		:1008FF24
-XF86RockerEnter		:1008FF25
-XF86Back		:1008FF26
-XF86Forward		:1008FF27
-XF86Stop		:1008FF28
-XF86Refresh		:1008FF29
-XF86PowerOff		:1008FF2A
-XF86WakeUp		:1008FF2B
-XF86Eject               :1008FF2C
-XF86ScreenSaver         :1008FF2D
-XF86WWW                 :1008FF2E
-XF86Sleep               :1008FF2F
-XF86Favorites		:1008FF30
-XF86AudioPause		:1008FF31
-XF86AudioMedia		:1008FF32
-XF86MyComputer		:1008FF33
-XF86VendorHome		:1008FF34
-XF86LightBulb		:1008FF35
-XF86Shop		:1008FF36
-XF86History		:1008FF37
-XF86OpenURL		:1008FF38
-XF86AddFavorite		:1008FF39
-XF86HotLinks		:1008FF3A
-XF86BrightnessAdjust	:1008FF3B
-XF86Finance		:1008FF3C
-XF86Community		:1008FF3D
-XF86AudioRewind		:1008FF3E
-XF86BackForward		:1008FF3F
-XF86Launch0		:1008FF40
-XF86Launch1		:1008FF41
-XF86Launch2		:1008FF42
-XF86Launch3		:1008FF43
-XF86Launch4		:1008FF44
-XF86Launch5		:1008FF45
-XF86Launch6		:1008FF46
-XF86Launch7		:1008FF47
-XF86Launch8		:1008FF48
-XF86Launch9		:1008FF49
-XF86LaunchA		:1008FF4A
-XF86LaunchB		:1008FF4B
-XF86LaunchC		:1008FF4C
-XF86LaunchD		:1008FF4D
-XF86LaunchE		:1008FF4E
-XF86LaunchF		:1008FF4F
-XF86ApplicationLeft	:1008FF50
-XF86ApplicationRight	:1008FF51
-XF86Book		:1008FF52
-XF86CD			:1008FF53
-XF86Calculater		:1008FF54
-XF86Clear		:1008FF55
-XF86Close		:1008FF56
-XF86Copy		:1008FF57
-XF86Cut			:1008FF58
-XF86Display		:1008FF59
-XF86DOS			:1008FF5A
-XF86Documents		:1008FF5B
-XF86Excel		:1008FF5C
-XF86Explorer		:1008FF5D
-XF86Game		:1008FF5E
-XF86Go			:1008FF5F
-XF86iTouch		:1008FF60
-XF86LogOff		:1008FF61
-XF86Market		:1008FF62
-XF86Meeting		:1008FF63
-XF86MenuKB		:1008FF65
-XF86MenuPB		:1008FF66
-XF86MySites		:1008FF67
-XF86New			:1008FF68
-XF86News		:1008FF69
-XF86OfficeHome		:1008FF6A
-XF86Open		:1008FF6B
-XF86Option		:1008FF6C
-XF86Paste		:1008FF6D
-XF86Phone		:1008FF6E
-XF86Q			:1008FF70
-XF86Reply		:1008FF72
-XF86Reload		:1008FF73
-XF86RotateWindows	:1008FF74
-XF86RotationPB		:1008FF75
-XF86RotationKB		:1008FF76
-XF86Save		:1008FF77
-XF86ScrollUp		:1008FF78
-XF86ScrollDown		:1008FF79
-XF86ScrollClick		:1008FF7A
-XF86Send		:1008FF7B
-XF86Spell		:1008FF7C
-XF86SplitScreen		:1008FF7D
-XF86Support		:1008FF7E
-XF86TaskPane		:1008FF7F
-XF86Terminal		:1008FF80
-XF86Tools		:1008FF81
-XF86Travel		:1008FF82
-XF86UserPB		:1008FF84
-XF86User1KB		:1008FF85
-XF86User2KB		:1008FF86
-XF86Video		:1008FF87
-XF86WheelButton		:1008FF88
-XF86Word		:1008FF89
-XF86Xfer		:1008FF8A
-XF86ZoomIn		:1008FF8B
-XF86ZoomOut		:1008FF8C
-XF86Away		:1008FF8D
-XF86Messenger		:1008FF8E
-XF86WebCam		:1008FF8F
-XF86MailForward		:1008FF90
-XF86Pictures		:1008FF91
-XF86Music		:1008FF92
-XF86Battery		:1008FF93
-XF86Bluetooth		:1008FF94
-XF86WLAN		:1008FF95
-XF86UWB			:1008FF96
-XF86AudioForward	:1008FF97
-XF86AudioRepeat		:1008FF98
-XF86AudioRandomPlay	:1008FF99
-XF86Subtitle		:1008FF9A
-XF86AudioCycleTrack	:1008FF9B
-XF86CycleAngle		:1008FF9C
-XF86FrameBack		:1008FF9D
-XF86FrameForward	:1008FF9E
-XF86Time		:1008FF9F
-XF86Select		:1008FFA0
-XF86View		:1008FFA1
-XF86TopMenu		:1008FFA2
-XF86Red			:1008FFA3
-XF86Green		:1008FFA4
-XF86Yellow		:1008FFA5
-XF86Blue             	:1008FFA6
-XF86Suspend		:1008FFA7
-XF86Hibernate		:1008FFA8
-XF86TouchpadToggle	:1008FFA9
-
-! XFree86 special action keys
-XF86_Switch_VT_1	:1008FE01
-XF86_Switch_VT_2	:1008FE02
-XF86_Switch_VT_3	:1008FE03
-XF86_Switch_VT_4	:1008FE04
-XF86_Switch_VT_5	:1008FE05
-XF86_Switch_VT_6	:1008FE06
-XF86_Switch_VT_7	:1008FE07
-XF86_Switch_VT_8	:1008FE08
-XF86_Switch_VT_9	:1008FE09
-XF86_Switch_VT_10	:1008FE0A
-XF86_Switch_VT_11	:1008FE0B
-XF86_Switch_VT_12	:1008FE0C
-XF86_Ungrab		:1008FE20
-XF86_ClearGrab		:1008FE21
-XF86_Next_VMode		:1008FE22
-XF86_Prev_VMode		:1008FE23
-
-usldead_acute		:100000A8
-usldead_grave		:100000A9
-usldead_diaeresis	:100000AB
-usldead_asciicircum	:100000AA
-usldead_asciitilde	:100000AC
-usldead_cedilla		:1000FE2C
-usldead_ring		:1000FEB0
diff --git a/lib/libX11/src/util/Makefile.in b/lib/libX11/src/util/Makefile.in
index c5e9fb6a8..34a9e7cc8 100644
--- a/lib/libX11/src/util/Makefile.in
+++ b/lib/libX11/src/util/Makefile.in
@@ -135,7 +135,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS_FOR_BUILD@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/src/util/makekeys.c b/lib/libX11/src/util/makekeys.c
index 1c27e6b21..8f88bebc0 100644
--- a/lib/libX11/src/util/makekeys.c
+++ b/lib/libX11/src/util/makekeys.c
@@ -51,63 +51,102 @@ static unsigned short offsets[KTNUM];
 static unsigned short indexes[KTNUM];
 static KeySym values[KTNUM];
 static char buf[1024];
+static int ksnum = 0;
+
+static int
+parse_line(const char *buf, char *key, KeySym *val, char *prefix)
+{
+    int i;
+    char alias[128];
+    char *tmp, *tmpa;
+
+    /* See if we can catch a straight XK_foo 0x1234-style definition first;
+     * the trickery around tmp is to account for prefices. */
+    i = sscanf(buf, "#define %127s 0x%lx", key, val);
+    if (i == 2 && (tmp = strstr(key, "XK_"))) {
+        memcpy(prefix, key, tmp - key);
+        prefix[tmp - key] = '\0';
+        tmp += 3;
+        memmove(key, tmp, strlen(tmp) + 1);
+        return 1;
+    }
+
+    /* Now try to catch alias (XK_foo XK_bar) definitions, and resolve them
+     * immediately: if the target is in the form XF86XK_foo, we need to
+     * canonicalise this to XF86foo before we do the lookup. */
+    i = sscanf(buf, "#define %127s %127s", key, alias);
+    if (i == 2 && (tmp = strstr(key, "XK_")) && (tmpa = strstr(alias, "XK_"))) {
+        memcpy(prefix, key, tmp - key);
+        prefix[tmp - key] = '\0';
+        tmp += 3;
+        memmove(key, tmp, strlen(tmp) + 1);
+        memmove(tmpa, tmpa + 3, strlen(tmpa + 3) + 1);
+
+        for (i = ksnum - 1; i >= 0; i--) {
+            if (strcmp(info[i].name, alias) == 0) {
+                *val = info[i].val;
+                return 1;
+            }
+        }
+
+        fprintf(stderr, "can't find matching definition %s for keysym %s%s\n",
+                alias, prefix, key);
+    }
+
+    return 0;
+}
 
 int
 main(int argc, char *argv[])
 {
-    int ksnum = 0;
     int max_rehash;
     Signature sig;
-    register int i, j, k, z;
-    register char *name;
-    register char c;
+    int i, j, k, l, z;
+    FILE *fptr;
+    char *name;
+    char c;
     int first;
     int best_max_rehash;
     int best_z = 0;
     int num_found;
     KeySym val;
-    char key[128];
-    char alias[128];
+    char key[128], prefix[128];
 
+    for (l = 1; l < argc; l++) {
+        fptr = fopen(argv[l], "r");
+        if (!fptr) {
+            fprintf(stderr, "couldn't open %s\n", argv[l]);
+            continue;
+        }
 
-    while (fgets(buf, sizeof(buf), stdin)) {
-	i = sscanf(buf, "#define XK_%127s 0x%lx", key, &info[ksnum].val);
-	if (i != 2) {
-	    i = sscanf(buf, "#define XK_%127s XK_%127s", key, alias);
-	    if (i != 2)
-		continue;
-	    for (i = ksnum - 1; i >= 0; i--) {
-		if (strcmp(info[i].name, alias) == 0) {
-		    info[ksnum].val = info[i].val;
-		    break;
-		}
-	    }
-	    if (i < 0) {  /* Didn't find a match */
-		fprintf(stderr,
-		    "can't find matching definition %s for keysym %s\n",
-		    alias, key);
-		continue;
-	    }
-	}
-	if (info[ksnum].val == XK_VoidSymbol)
-	    info[ksnum].val = 0;
-	if (info[ksnum].val > 0x1fffffff) {
-	    fprintf(stderr,
-		    "ignoring illegal keysym (%s), remove it from .h file!\n",
-		    key);
-	    continue;
-	}
-	name = strdup(key);
-	if (!name) {
-	    fprintf(stderr, "makekeys: out of memory!\n");
-	    exit(1);
-	}
-	info[ksnum].name = name;
-	ksnum++;
-	if (ksnum == KTNUM) {
-	    fprintf(stderr, "makekeys: too many keysyms!\n");
-	    exit(1);
-	}
+        while (fgets(buf, sizeof(buf), fptr)) {
+            if (!parse_line(buf, key, &val, prefix))
+                continue;
+
+            if (val == XK_VoidSymbol)
+                val = 0;
+            if (val > 0x1fffffff) {
+                fprintf(stderr, "ignoring illegal keysym (%s, %lx)\n", key,
+                        val);
+                continue;
+            }
+
+            name = malloc(strlen(prefix) + strlen(key) + 1);
+            if (!name) {
+                fprintf(stderr, "makekeys: out of memory!\n");
+                exit(1);
+            }
+            sprintf(name, "%s%s", prefix, key);
+            info[ksnum].name = name;
+            info[ksnum].val = val;
+            ksnum++;
+            if (ksnum == KTNUM) {
+                fprintf(stderr, "makekeys: too many keysyms!\n");
+                exit(1);
+            }
+        }
+
+        fclose(fptr);
     }
 
     printf("/* This file is generated from keysymdef.h. */\n");
diff --git a/lib/libX11/src/xcms/Makefile.in b/lib/libX11/src/xcms/Makefile.in
index d9754270a..b3cbebf1f 100644
--- a/lib/libX11/src/xcms/Makefile.in
+++ b/lib/libX11/src/xcms/Makefile.in
@@ -155,7 +155,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/src/xkb/Makefile.in b/lib/libX11/src/xkb/Makefile.in
index 7081436a0..c7a97066c 100644
--- a/lib/libX11/src/xkb/Makefile.in
+++ b/lib/libX11/src/xkb/Makefile.in
@@ -138,7 +138,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
diff --git a/lib/libX11/src/xlibi18n/Makefile.in b/lib/libX11/src/xlibi18n/Makefile.in
index 80546ead3..c9aa47b78 100644
--- a/lib/libX11/src/xlibi18n/Makefile.in
+++ b/lib/libX11/src/xlibi18n/Makefile.in
@@ -173,7 +173,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KEYSYMDEF = @KEYSYMDEF@
+KEYSYMDEFS = @KEYSYMDEFS@
 LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@