Now compile complete locale

62 files changed, 372 insertions, 37 deletions

diff --git a/libX11/nls/am_ET.UTF-8/makefile b/libX11/nls/am_ET.UTF-8/makefile
new file mode 100644
index 000000000..d36631a31
--- /dev/null
+++ b/libX11/nls/am_ET.UTF-8/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\am_ET.UTF-8
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/armscii-8/makefile b/libX11/nls/armscii-8/makefile
new file mode 100644
index 000000000..7ef44af01
--- /dev/null
+++ b/libX11/nls/armscii-8/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\armscii-8
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/el_GR.UTF-8/makefile b/libX11/nls/el_GR.UTF-8/makefile
new file mode 100644
index 000000000..d5aaaf17d
--- /dev/null
+++ b/libX11/nls/el_GR.UTF-8/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\el_GR.UTF-8
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/en_US.UTF-8/makefile b/libX11/nls/en_US.UTF-8/makefile
new file mode 100644
index 000000000..30179f391
--- /dev/null
+++ b/libX11/nls/en_US.UTF-8/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\en_US.UTF-8
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/fi_FI.UTF-8/makefile b/libX11/nls/fi_FI.UTF-8/makefile
new file mode 100644
index 000000000..ab3730dea
--- /dev/null
+++ b/libX11/nls/fi_FI.UTF-8/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\fi_FI.UTF-8
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/georgian-academy/makefile b/libX11/nls/georgian-academy/makefile
new file mode 100644
index 000000000..4066ffa82
--- /dev/null
+++ b/libX11/nls/georgian-academy/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\georgian-academy
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/georgian-ps/makefile b/libX11/nls/georgian-ps/makefile
new file mode 100644
index 000000000..a496aa10f
--- /dev/null
+++ b/libX11/nls/georgian-ps/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\georgian-ps
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/ibm-cp1133/makefile b/libX11/nls/ibm-cp1133/makefile
new file mode 100644
index 000000000..ea195d803
--- /dev/null
+++ b/libX11/nls/ibm-cp1133/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\ibm-cp1133
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/iscii-dev/makefile b/libX11/nls/iscii-dev/makefile
new file mode 100644
index 000000000..53798b936
--- /dev/null
+++ b/libX11/nls/iscii-dev/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\iscii-dev
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/isiri-3342/makefile b/libX11/nls/isiri-3342/makefile
new file mode 100644
index 000000000..9737df15c
--- /dev/null
+++ b/libX11/nls/isiri-3342/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\isiri-3342
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/iso8859-10/makefile b/libX11/nls/iso8859-10/makefile
new file mode 100644
index 000000000..a3cb63b6e
--- /dev/null
+++ b/libX11/nls/iso8859-10/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-10
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/iso8859-11/makefile b/libX11/nls/iso8859-11/makefile
new file mode 100644
index 000000000..3663f9218
--- /dev/null
+++ b/libX11/nls/iso8859-11/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-11
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/iso8859-13/makefile b/libX11/nls/iso8859-13/makefile
new file mode 100644
index 000000000..e37d77d81
--- /dev/null
+++ b/libX11/nls/iso8859-13/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-13
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/iso8859-14/makefile b/libX11/nls/iso8859-14/makefile
new file mode 100644
index 000000000..be48c10cd
--- /dev/null
+++ b/libX11/nls/iso8859-14/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-14
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/iso8859-15/makefile b/libX11/nls/iso8859-15/makefile
new file mode 100644
index 000000000..0d3802cc0
--- /dev/null
+++ b/libX11/nls/iso8859-15/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-15
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/iso8859-2/makefile b/libX11/nls/iso8859-2/makefile
new file mode 100644
index 000000000..226e2a055
--- /dev/null
+++ b/libX11/nls/iso8859-2/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-2
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/iso8859-3/makefile b/libX11/nls/iso8859-3/makefile
new file mode 100644
index 000000000..bb0130b18
--- /dev/null
+++ b/libX11/nls/iso8859-3/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-3
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/iso8859-4/makefile b/libX11/nls/iso8859-4/makefile
new file mode 100644
index 000000000..a4fbc942f
--- /dev/null
+++ b/libX11/nls/iso8859-4/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-4
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/iso8859-5/makefile b/libX11/nls/iso8859-5/makefile
new file mode 100644
index 000000000..dcf1c125c
--- /dev/null
+++ b/libX11/nls/iso8859-5/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-5
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/iso8859-6/makefile b/libX11/nls/iso8859-6/makefile
new file mode 100644
index 000000000..fb0b1af50
--- /dev/null
+++ b/libX11/nls/iso8859-6/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-6
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/iso8859-7/makefile b/libX11/nls/iso8859-7/makefile
new file mode 100644
index 000000000..bf50d774c
--- /dev/null
+++ b/libX11/nls/iso8859-7/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-7
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/iso8859-8/makefile b/libX11/nls/iso8859-8/makefile
new file mode 100644
index 000000000..9963b63e5
--- /dev/null
+++ b/libX11/nls/iso8859-8/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-8
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/iso8859-9/makefile b/libX11/nls/iso8859-9/makefile
new file mode 100644
index 000000000..7f3474990
--- /dev/null
+++ b/libX11/nls/iso8859-9/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-9
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/iso8859-9e/makefile b/libX11/nls/iso8859-9e/makefile
new file mode 100644
index 000000000..412dd5965
--- /dev/null
+++ b/libX11/nls/iso8859-9e/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\iso8859-9e
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/ja.JIS/makefile b/libX11/nls/ja.JIS/makefile
new file mode 100644
index 000000000..470a8de0f
--- /dev/null
+++ b/libX11/nls/ja.JIS/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\ja.JIS
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/ja.S90/makefile b/libX11/nls/ja.S90/makefile
new file mode 100644
index 000000000..365a5cef3
--- /dev/null
+++ b/libX11/nls/ja.S90/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\ja.S90
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/ja.SJIS/makefile b/libX11/nls/ja.SJIS/makefile
new file mode 100644
index 000000000..230a80b36
--- /dev/null
+++ b/libX11/nls/ja.SJIS/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\ja.SJIS
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/ja.U90/makefile b/libX11/nls/ja.U90/makefile
new file mode 100644
index 000000000..bcb58cb99
--- /dev/null
+++ b/libX11/nls/ja.U90/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\ja.U90
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/ja/makefile b/libX11/nls/ja/makefile
new file mode 100644
index 000000000..72bbc50bc
--- /dev/null
+++ b/libX11/nls/ja/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\ja
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/ja_JP.UTF-8/makefile b/libX11/nls/ja_JP.UTF-8/makefile
new file mode 100644
index 000000000..017fff57a
--- /dev/null
+++ b/libX11/nls/ja_JP.UTF-8/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\ja_JP.UTF-8
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/ko/makefile b/libX11/nls/ko/makefile
new file mode 100644
index 000000000..3c6655ffe
--- /dev/null
+++ b/libX11/nls/ko/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\ko
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/ko_KR.UTF-8/makefile b/libX11/nls/ko_KR.UTF-8/makefile
new file mode 100644
index 000000000..f60f3e3a7
--- /dev/null
+++ b/libX11/nls/ko_KR.UTF-8/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\ko_KR.UTF-8
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/koi8-c/makefile b/libX11/nls/koi8-c/makefile
new file mode 100644
index 000000000..34b58b2b8
--- /dev/null
+++ b/libX11/nls/koi8-c/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\koi8-c
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/koi8-r/makefile b/libX11/nls/koi8-r/makefile
new file mode 100644
index 000000000..77ed038ac
--- /dev/null
+++ b/libX11/nls/koi8-r/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\koi8-r
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/koi8-u/makefile b/libX11/nls/koi8-u/makefile
new file mode 100644
index 000000000..d60988564
--- /dev/null
+++ b/libX11/nls/koi8-u/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\koi8-u
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/makefile b/libX11/nls/makefile
index 19bf45e7a..044afd3b9 100644
--- a/libX11/nls/makefile
+++ b/libX11/nls/makefile
@@ -1 +1,82 @@
-SUBDIRS = C iso8859-1

+SUBDIRS= \

+	am_ET.UTF-8		\

+	armscii-8		\

+	C			\

+	el_GR.UTF-8		\

+	en_US.UTF-8		\

+	fi_FI.UTF-8		\

+	georgian-academy	\

+	georgian-ps		\

+	ibm-cp1133		\

+	iscii-dev		\

+	isiri-3342		\

+	iso8859-1		\

+	iso8859-10		\

+	iso8859-11		\

+	iso8859-13		\

+	iso8859-14		\

+	iso8859-15		\

+	iso8859-2		\

+	iso8859-3		\

+	iso8859-4		\

+	iso8859-5		\

+	iso8859-6		\

+	iso8859-7		\

+	iso8859-8		\

+	iso8859-9		\

+	iso8859-9e		\

+	ja			\

+	ja.JIS			\

+	ja_JP.UTF-8		\

+	ja.S90			\

+	ja.SJIS			\

+	ja.U90			\

+	ko			\

+	koi8-c			\

+	koi8-r			\

+	koi8-u			\

+	ko_KR.UTF-8		\

+	microsoft-cp1251	\

+	microsoft-cp1255	\

+	microsoft-cp1256	\

+	mulelao-1		\

+	nokhchi-1		\

+	pt_BR.UTF-8		\

+	ru_RU.UTF-8		\

+	tatar-cyr		\

+	th_TH			\

+	th_TH.UTF-8		\

+	tscii-0			\

+	vi_VN.tcvn		\

+	vi_VN.viscii		\

+	zh_CN			\

+	zh_CN.gb18030		\

+	zh_CN.gbk		\

+	zh_CN.UTF-8		\

+	zh_HK.big5		\

+	zh_HK.big5hkscs		\

+	zh_HK.UTF-8		\

+	zh_TW			\

+	zh_TW.big5		\

+	zh_TW.UTF-8

+

+CPP_FILES_FLAGS = -DWCHAR32=@WCHAR32@

+

+X11_LOCALEDATADIR = ..\..\xorg-server\locale

+

+$(X11_LOCALEDATADIR)\locale.alias: locale.alias.pre

+	cl /nologo /EP $< -DXCOMM\#\# > locale.alias.l1

+	sed -e "/^[^\#][^        ]*:/s/://" -e "/^[^\#].*[        ].*:/d" < locale.alias.l1 > locale.alias.l2

+	cat locale.alias.l2 locale.alias.l1 > $@

+

+$(X11_LOCALEDATADIR)\compose.dir: compose.dir.pre

+	cl /nologo /EP $< -DXCOMM\#\# > compose.dir.l1

+	sed -e "/^[^\#][^        ]*:/s/://" -e "/^[^\#].*[        ].*:/d" < compose.dir.l1 > compose.dir.l2

+	cat compose.dir.l2 compose.dir.l1 > $@

+

+$(X11_LOCALEDATADIR)\locale.dir: locale.dir.pre

+	cl /nologo /EP $< -DXCOMM\#\# > locale.dir.l1

+	sed -e "/^[^\#][^        ]*:/s/://" -e "/^[^\#].*[        ].*:/d" < locale.dir.l1 > locale.dir.l2

+	cat locale.dir.l2 locale.dir.l1 > $@

+

+all: $(X11_LOCALEDATADIR)\locale.alias $(X11_LOCALEDATADIR)\compose.dir $(X11_LOCALEDATADIR)\locale.dir

diff --git a/libX11/nls/microsoft-cp1251/makefile b/libX11/nls/microsoft-cp1251/makefile
new file mode 100644
index 000000000..973c150ea
--- /dev/null
+++ b/libX11/nls/microsoft-cp1251/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\microsoft-cp1251
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/microsoft-cp1255/makefile b/libX11/nls/microsoft-cp1255/makefile
new file mode 100644
index 000000000..b5c97a764
--- /dev/null
+++ b/libX11/nls/microsoft-cp1255/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\microsoft-cp1255
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/microsoft-cp1256/makefile b/libX11/nls/microsoft-cp1256/makefile
new file mode 100644
index 000000000..b45902da0
--- /dev/null
+++ b/libX11/nls/microsoft-cp1256/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\microsoft-cp1256
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/mulelao-1/makefile b/libX11/nls/mulelao-1/makefile
new file mode 100644
index 000000000..f502bfb88
--- /dev/null
+++ b/libX11/nls/mulelao-1/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\mulelao-1
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/nokhchi-1/makefile b/libX11/nls/nokhchi-1/makefile
new file mode 100644
index 000000000..b68d6367b
--- /dev/null
+++ b/libX11/nls/nokhchi-1/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\nokhchi-1
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/pt_BR.UTF-8/makefile b/libX11/nls/pt_BR.UTF-8/makefile
new file mode 100644
index 000000000..f13141041
--- /dev/null
+++ b/libX11/nls/pt_BR.UTF-8/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\pt_BR.UTF-8
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/ru_RU.UTF-8/makefile b/libX11/nls/ru_RU.UTF-8/makefile
new file mode 100644
index 000000000..d6b9e48ab
--- /dev/null
+++ b/libX11/nls/ru_RU.UTF-8/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\ru_RU.UTF-8
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/tatar-cyr/makefile b/libX11/nls/tatar-cyr/makefile
new file mode 100644
index 000000000..cbb2e2105
--- /dev/null
+++ b/libX11/nls/tatar-cyr/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\tatar-cyr
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/th_TH.UTF-8/makefile b/libX11/nls/th_TH.UTF-8/makefile
new file mode 100644
index 000000000..712d2495a
--- /dev/null
+++ b/libX11/nls/th_TH.UTF-8/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\th_TH.UTF-8
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/th_TH/makefile b/libX11/nls/th_TH/makefile
new file mode 100644
index 000000000..15fdad4c0
--- /dev/null
+++ b/libX11/nls/th_TH/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\th_TH
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/tscii-0/makefile b/libX11/nls/tscii-0/makefile
new file mode 100644
index 000000000..5135beaca
--- /dev/null
+++ b/libX11/nls/tscii-0/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\tscii-0
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/vi_VN.tcvn/makefile b/libX11/nls/vi_VN.tcvn/makefile
new file mode 100644
index 000000000..4b131ddd7
--- /dev/null
+++ b/libX11/nls/vi_VN.tcvn/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\vi_VN.tcvn
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/vi_VN.viscii/makefile b/libX11/nls/vi_VN.viscii/makefile
new file mode 100644
index 000000000..58dcdd262
--- /dev/null
+++ b/libX11/nls/vi_VN.viscii/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\vi_VN.viscii
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/zh_CN.UTF-8/makefile b/libX11/nls/zh_CN.UTF-8/makefile
new file mode 100644
index 000000000..01c319dcc
--- /dev/null
+++ b/libX11/nls/zh_CN.UTF-8/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\zh_CN.UTF-8
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/zh_CN.gb18030/makefile b/libX11/nls/zh_CN.gb18030/makefile
new file mode 100644
index 000000000..90f0d21e1
--- /dev/null
+++ b/libX11/nls/zh_CN.gb18030/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\zh_CN.gb18030
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/zh_CN.gbk/makefile b/libX11/nls/zh_CN.gbk/makefile
new file mode 100644
index 000000000..418e63e5a
--- /dev/null
+++ b/libX11/nls/zh_CN.gbk/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\zh_CN.gbk
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/zh_CN/makefile b/libX11/nls/zh_CN/makefile
new file mode 100644
index 000000000..d019b7bed
--- /dev/null
+++ b/libX11/nls/zh_CN/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\zh_CN
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/zh_HK.UTF-8/makefile b/libX11/nls/zh_HK.UTF-8/makefile
new file mode 100644
index 000000000..45b3fea5a
--- /dev/null
+++ b/libX11/nls/zh_HK.UTF-8/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\zh_HK.UTF-8
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/zh_HK.big5/makefile b/libX11/nls/zh_HK.big5/makefile
new file mode 100644
index 000000000..577695f36
--- /dev/null
+++ b/libX11/nls/zh_HK.big5/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\zh_HK.big5
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/zh_HK.big5hkscs/makefile b/libX11/nls/zh_HK.big5hkscs/makefile
new file mode 100644
index 000000000..dba8d60ec
--- /dev/null
+++ b/libX11/nls/zh_HK.big5hkscs/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\zh_HK.big5hkscs
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/zh_TW.UTF-8/makefile b/libX11/nls/zh_TW.UTF-8/makefile
new file mode 100644
index 000000000..99ca0bd22
--- /dev/null
+++ b/libX11/nls/zh_TW.UTF-8/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\zh_TW.UTF-8
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/zh_TW.big5/makefile b/libX11/nls/zh_TW.big5/makefile
new file mode 100644
index 000000000..0ecbc0818
--- /dev/null
+++ b/libX11/nls/zh_TW.big5/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\zh_TW.big5
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/libX11/nls/zh_TW/makefile b/libX11/nls/zh_TW/makefile
new file mode 100644
index 000000000..41ab5a02e
--- /dev/null
+++ b/libX11/nls/zh_TW/makefile
@@ -0,0 +1,5 @@
+X11_LOCALEDATADIR = ..\..\..\xorg-server\locale
+
+x11thislocaledir = $(X11_LOCALEDATADIR)\zh_TW
+
+all: $(x11thislocaledir)\XLC_LOCALE $(x11thislocaledir)\Compose
diff --git a/xorg-server/locale/compose.dir b/xorg-server/locale/compose.dir
deleted file mode 100644
index 22391882f..000000000
--- a/xorg-server/locale/compose.dir
+++ /dev/null
@@ -1,9 +0,0 @@
-# $Xorg: compose.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
-#
-#	This file contains compose table file name.
-#	The first word is the compose table file name and
-#	the second word is full locale name.
-#
-# $XFree86: xc/nls/compose.dir,v 1.24 2003/08/06 14:04:00 eich Exp $
-#
-iso8859-1/Compose:		C
diff --git a/xorg-server/locale/locale.alias b/xorg-server/locale/locale.alias
deleted file mode 100644
index da9751406..000000000
--- a/xorg-server/locale/locale.alias
+++ /dev/null
@@ -1,16 +0,0 @@
-#	$XdotOrg: lib/X11/nls/locale.alias.pre,v 1.12 2005-09-30 07:52:46 daniels Exp $
-#	$Xorg: locale.alias,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
-#
-#	This file contains alias name of locale.
-#	Each alias name is described within one line.
-#	The first word is the alias name (simplified locale name)
-#	the second word is full locale name.
-#
-#	$XFree86: xc/nls/locale.alias,v 1.65 2004/01/03 03:31:00 dawes Exp $
-#
-
-POSIX:						C
-POSIX-UTF2:					C
-C_C.C:						C
-C.en:						C
-English_United-States.437:			C
diff --git a/xorg-server/locale/locale.dir b/xorg-server/locale/locale.dir
deleted file mode 100644
index 116fdf818..000000000
--- a/xorg-server/locale/locale.dir
+++ /dev/null
@@ -1,11 +0,0 @@
-#	$XdotOrg: lib/X11/nls/locale.dir.pre,v 1.10 2005-09-30 07:52:46 daniels Exp $
-#	$Xorg: locale.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
-#
-#	This file contains locale database file names
-#	The first word is the locale database file name and
-#	the second word is the full locale name.
-#
-#	$XFree86: xc/nls/locale.dir,v 1.44 2003/12/18 04:14:22 dawes Exp $
-#
-
-C/XLC_LOCALE:				C