From: Kenichi Handa <handa@m17n.org>
Date: Tue, 20 May 2003 13:06:09 +0000 (+0000)
Subject: (MAPS): Change gb18030.map to gb18030-2.map
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~43
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca265227855188d67c03d3cda6ff54f66267f17a;p=emacs.git

(MAPS): Change gb18030.map to gb18030-2.map
and gb18030-4.map.
(gb18030.map): Delete this target.
(gb18030-2.map, gb18030-4.map): New targets.
---

diff --git a/etc/charsets/Makefile b/etc/charsets/Makefile
index f0ccafc8b81..0d5206ae64c 100644
--- a/etc/charsets/Makefile
+++ b/etc/charsets/Makefile
@@ -47,12 +47,11 @@ MAPS =	8859-2.map \
 	viscii.map \
 	koi8-r.map \
 	ibm866.map \
-	mac-roman.map \
-	gb18030-bmp.map
+	mac-roman.map
 
 all: ${MAPS}
 
-GLIBCDIR=../../../src/glibc-2.2.4/localedata/charmaps
+GLIBCDIR=../../../m17n-db/glibc-2.3/localedata/charmaps
 ICUDIR=../../../icu/data
 
 8859-%.map: ${GLIBCDIR}/ISO-8859-%
@@ -148,8 +147,13 @@ mac-roman.map: ${GLIBCDIR}/MACINTOSH
 	  '/^<U[^x]*x[89A-Fa-f]/s/<U\(....\)[^x]*x\(..\).*/0x\2 0x\1/p' \
 	  < $< > $@
 
-gb18030-bmp.map: ${ICUDIR}/gb18030.ucm gb18030.awk
-	${SED} -n -e '/CHARMAP/,/END CHARMAP/p' < $< | gawk -f gb18030.awk > $@
+gb18030-2.map: ${GLIBCDIR}/GB18030 gb18030-2.awk
+	${SED} -n '/^<U....>[ 	]*\/x..\/x..[ 	]/ p' < $< \
+	| ${SED} -e 's,<U\([^>]*\)>[ 	]*/x\(..\)/x\(..\).*$$,0x\2\3 0x\1,' \
+	| sort | gawk -f gb18030-2.awk > $@
+
+gb18030-4byte.map: gb18030-2.map gb18030-4.awk
+	gawk -f gb18030-4.awk < $< > $@
 
 maintainer-clean:
 	rm -rf ${MAPS}