summaryrefslogtreecommitdiff
path: root/lib/libX11/nls
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2010-10-05 19:51:00 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2010-10-05 19:51:00 +0000
commita6fc6740cffa7e274f9a86ce485983548cef24ef (patch)
treed5f6d95d9d3a7781bf423533ccc27977d833fc91 /lib/libX11/nls
parent886d6f45644e0f447292393ce4d0cad38cb6dfb8 (diff)
Update to libX11 1.3.6.
Tested by ajacoutot@, jasper@ and krw@.
Diffstat (limited to 'lib/libX11/nls')
-rw-r--r--lib/libX11/nls/C/Makefile.in2
-rw-r--r--lib/libX11/nls/Makefile.in2
-rw-r--r--lib/libX11/nls/am_ET.UTF-8/Makefile.in2
-rw-r--r--lib/libX11/nls/armscii-8/Makefile.in2
-rw-r--r--lib/libX11/nls/el_GR.UTF-8/Makefile.in2
-rw-r--r--lib/libX11/nls/en_US.UTF-8/Makefile.in2
-rw-r--r--lib/libX11/nls/fi_FI.UTF-8/Makefile.in2
-rw-r--r--lib/libX11/nls/georgian-academy/Makefile.in2
-rw-r--r--lib/libX11/nls/georgian-ps/Makefile.in2
-rw-r--r--lib/libX11/nls/ibm-cp1133/Makefile.in2
-rw-r--r--lib/libX11/nls/iscii-dev/Makefile.in2
-rw-r--r--lib/libX11/nls/isiri-3342/Makefile.in2
-rw-r--r--lib/libX11/nls/iso8859-1/Makefile.in2
-rw-r--r--lib/libX11/nls/iso8859-10/Makefile.in2
-rw-r--r--lib/libX11/nls/iso8859-11/Makefile.in2
-rw-r--r--lib/libX11/nls/iso8859-13/Makefile.in2
-rw-r--r--lib/libX11/nls/iso8859-14/Makefile.in2
-rw-r--r--lib/libX11/nls/iso8859-15/Makefile.in2
-rw-r--r--lib/libX11/nls/iso8859-2/Makefile.in2
-rw-r--r--lib/libX11/nls/iso8859-3/Makefile.in2
-rw-r--r--lib/libX11/nls/iso8859-4/Makefile.in2
-rw-r--r--lib/libX11/nls/iso8859-5/Makefile.in2
-rw-r--r--lib/libX11/nls/iso8859-6/Makefile.in2
-rw-r--r--lib/libX11/nls/iso8859-7/Makefile.in2
-rw-r--r--lib/libX11/nls/iso8859-8/Makefile.in2
-rw-r--r--lib/libX11/nls/iso8859-9/Makefile.in2
-rw-r--r--lib/libX11/nls/iso8859-9e/Makefile.in2
-rw-r--r--lib/libX11/nls/ja.JIS/Makefile.in2
-rw-r--r--lib/libX11/nls/ja.S90/Makefile.in2
-rw-r--r--lib/libX11/nls/ja.SJIS/Makefile.in2
-rw-r--r--lib/libX11/nls/ja.U90/Makefile.in2
-rw-r--r--lib/libX11/nls/ja/Makefile.in2
-rw-r--r--lib/libX11/nls/ja_JP.UTF-8/Makefile.in2
-rw-r--r--lib/libX11/nls/ko/Makefile.in2
-rw-r--r--lib/libX11/nls/ko_KR.UTF-8/Makefile.in2
-rw-r--r--lib/libX11/nls/koi8-c/Makefile.in2
-rw-r--r--lib/libX11/nls/koi8-r/Makefile.in2
-rw-r--r--lib/libX11/nls/koi8-u/Makefile.in2
-rw-r--r--lib/libX11/nls/locale.alias.pre2
-rw-r--r--lib/libX11/nls/microsoft-cp1251/Makefile.in2
-rw-r--r--lib/libX11/nls/microsoft-cp1255/Makefile.in2
-rw-r--r--lib/libX11/nls/microsoft-cp1256/Makefile.in2
-rw-r--r--lib/libX11/nls/mulelao-1/Makefile.in2
-rw-r--r--lib/libX11/nls/nokhchi-1/Makefile.in2
-rw-r--r--lib/libX11/nls/pt_BR.UTF-8/Makefile.in2
-rw-r--r--lib/libX11/nls/ru_RU.UTF-8/Makefile.in2
-rw-r--r--lib/libX11/nls/tatar-cyr/Makefile.in2
-rw-r--r--lib/libX11/nls/th_TH.UTF-8/Makefile.in2
-rw-r--r--lib/libX11/nls/th_TH/Makefile.in2
-rw-r--r--lib/libX11/nls/tscii-0/Makefile.in2
-rw-r--r--lib/libX11/nls/vi_VN.tcvn/Makefile.in2
-rw-r--r--lib/libX11/nls/vi_VN.viscii/Makefile.in2
-rw-r--r--lib/libX11/nls/zh_CN.UTF-8/Makefile.in2
-rw-r--r--lib/libX11/nls/zh_CN.gb18030/Makefile.in2
-rw-r--r--lib/libX11/nls/zh_CN.gbk/Makefile.in2
-rw-r--r--lib/libX11/nls/zh_CN/Makefile.in2
-rw-r--r--lib/libX11/nls/zh_HK.UTF-8/Makefile.in2
-rw-r--r--lib/libX11/nls/zh_HK.big5/Makefile.in2
-rw-r--r--lib/libX11/nls/zh_HK.big5hkscs/Makefile.in2
-rw-r--r--lib/libX11/nls/zh_TW.UTF-8/Makefile.in2
-rw-r--r--lib/libX11/nls/zh_TW.big5/Makefile.in2
-rw-r--r--lib/libX11/nls/zh_TW/Makefile.in2
62 files changed, 63 insertions, 61 deletions
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@