Generate admin/charsets Makefile via configure, and make more portable.

* configure.ac (SUBDIR_MAKEFILES): Add admin/charsets/Makefile.
(admin/charsets/Makefile): Generate it.
* admin/charsets/Makefile.in: Rename from Makefile.
(AWK, srcdir, top_srcdir, AM_DEFAULT_VERBOSITY):
New variables, set by configure.
(charsetdir, lispintdir, mapfiledir, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0)
(am__v_at_1, LOCAL, mapconv, run_mapconv, big5, compact, cp51932)
(cp932, eucjp_ms, gb180302, gb180304, kuten): New variables.
(TRANS_TABLE, CHARSETS): Add directory prefix to value.
(all): Declare PHONY.
(local): New PHONY target.
(map_template): New template.  Use to define short PHONY aliases.
(*.map): Add directory prefixes to targets and prerequisites.
Respect make verbosity.
(JISC6226.map): Replace non-portable sed append without newline.
(install): Remove rule.
(clean): Only delete temporary sedscript.
(bootstrap-clean, distclean, maintainer-clean, extraclean)
(totalclean): New PHONY rules.
* admin/charsets/mapconv (BASE): Replace basename with expr.
(FILE): Add "mapfiles" subdirectory.
(AWK): New variable.  Use throughout in place of "awk".
(main): Use "gunzip -c" in place of "zcat".
Don't leave whitespace before "p", for older sed.
* admin/charsets/mapfiles/PTCP154: Add final newline,
to make older sed versions happy.
; * .gitignore: Ignore admin/charsets/Makefile.

6 files changed, 355 insertions, 339 deletions

diff --git a/.gitignore b/.gitignore
index 618249c8def..df9dc8b110c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,6 @@ Info.plist
 InfoPlist.strings
 Makefile
 makefile
-!admin/charsets/Makefile
 !etc/refcards/Makefile
 !test/automated/data/flymake/Makefile
 !test/indent/Makefile
diff --git a/admin/charsets/Makefile b/admin/charsets/Makefile
deleted file mode 100644
index e5cf2508d85..00000000000
--- a/admin/charsets/Makefile
+++ /dev/null
@@ -1,324 +0,0 @@
-# Makefile -- Makefile to generate charset maps in etc/charsets.
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-#   National Institute of Advanced Industrial Science and Technology (AIST)
-#   Registration Number H13PRO009
-#
-# This file is part of GNU Emacs.
-
-# GNU Emacs is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# GNU Emacs is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-# Commentary:
-
-#  If your system doesn't have the directory /usr/share/i18n/charmaps,
-#  get the source of the latest glibc, gzip all the charmap files in
-#  the directory "localedate/charmaps", and set the variable
-#  GLIBC_CHARMAPS to that directory.
-
-GLIBC_CHARMAPS=/usr/share/i18n/charmaps
-
-CHARSETS = ${ISO8859} ${IBM} ${CODEPAGE} ${CJK} ${MISC} ${MULE}
-
-# Note: We can not prepend "ISO-" to these map files because of file
-# name limits on DOS.
-ISO8859 = \
-        8859-2.map 8859-3.map 8859-4.map 8859-5.map 8859-6.map 8859-7.map \
-        8859-8.map 8859-9.map 8859-10.map 8859-11.map 8859-13.map 8859-14.map \
-        8859-15.map 8859-16.map
-
-IBM = \
-        IBM037.map IBM038.map \
-        IBM256.map IBM273.map IBM274.map IBM275.map IBM277.map IBM278.map \
-        IBM280.map IBM281.map IBM284.map IBM285.map IBM290.map IBM297.map \
-        IBM420.map IBM423.map IBM424.map IBM437.map IBM500.map IBM850.map \
-        IBM851.map IBM852.map IBM855.map IBM856.map IBM857.map IBM860.map \
-        IBM861.map IBM862.map IBM863.map IBM864.map IBM865.map IBM866.map \
-        IBM868.map IBM869.map IBM870.map IBM871.map IBM874.map IBM875.map \
-        IBM880.map IBM891.map IBM903.map IBM904.map IBM905.map IBM918.map \
-        IBM1004.map IBM1026.map IBM1047.map
-
-CODEPAGE = \
-        CP737.map CP775.map CP1125.map\
-        CP1250.map CP1251.map CP1252.map CP1253.map CP1254.map \
-        CP1255.map CP1256.map CP1257.map CP1258.map \
-        CP10007.map \
-        CP720.map CP858.map
-
-CJK =   GB2312.map GBK.map GB180302.map GB180304.map \
-        BIG5.map BIG5-HKSCS.map\
-        CNS-1.map CNS-2.map CNS-3.map CNS-4.map CNS-5.map CNS-6.map CNS-7.map \
-        CNS-F.map \
-        JISX0201.map JISX0208.map JISX0212.map JISX2131.map JISX2132.map \
-        JISC6226.map CP932-2BYTE.map JISX213A.map\
-        KSC5601.map KSC5636.map JOHAB.map
-
-MISC =  KOI-8.map KOI8-R.map KOI8-U.map KOI8-T.map ALTERNATIVNYJ.map \
-        MIK.map PTCP154.map \
-        TIS-620.map VISCII.map VSCII.map VSCII-2.map\
-        KA-PS.map KA-ACADEMY.map \
-        HP-ROMAN8.map NEXTSTEP.map MACINTOSH.map EBCDICUK.map EBCDICUS.map \
-        stdenc.map symbol.map \
-        CP949-2BYTE.map \
-        BIG5-1.map BIG5-2.map
-
-# Emacs-mule charsets.
-MULE =  MULE-ethiopic.map MULE-ipa.map MULE-is13194.map \
-        MULE-sisheng.map MULE-tibetan.map \
-        MULE-lviscii.map MULE-uviscii.map
-
-TRANS_TABLE = cp51932.el eucjp-ms.el
-SED_SCRIPT = jisx2131-filter
-
-all: ${CHARSETS} ${TRANS_TABLE}
-
-AWK = gawk
-
-# Rules for each charset
-
-VSCII.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x[0-9a-f].[  ]/' GLIBC-1 compact.awk > $@
-
-VSCII-2.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x[2-7a-f].[  ]/' GLIBC-1 compact.awk \
-          | sed 's/0x20-0x7F.*/0x00-0x7F 0x0000/' > $@
-
-ALTERNATIVNYJ.map: IBM866.map
-        # Generating $@...
-        @echo "# Modified from IBM866.map according to the chart at" > $@
-        @echo "# http://www.cyrillic.com/ref/cyrillic/koi-8alt.html," >> $@
-        @echo "# with guesses for the Unicodes of the glyphs." >> $@
-        @sed -e '1 d' \
-             -e '/0xF2/ s/ .*/ 0x2019/' \
-             -e '/0xF3/ s/ .*/ 0x2018/' \
-             -e '/0xF4/ s/ .*/ 0x0301/' \
-             -e '/0xF5/ s/ .*/ 0x0300/' \
-             -e '/0xF6/ s/ .*/ 0x203A/' \
-             -e '/0xF7/ s/ .*/ 0x2039/' \
-             -e '/0xF8/ s/ .*/ 0x2191/' \
-             -e '/0xF9/ s/ .*/ 0x2193/' \
-             -e '/0xFA/ s/ .*/ 0x00B1/' \
-             -e '/0xFB/ s/ .*/ 0x00F7/' < $< >> $@
-
-MIK.map: mapfiles/bulgarian-mik.txt mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '1,$$' CZYBORRA compact.awk > $@
-
-PTCP154.map: mapfiles/PTCP154 mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^0x/' IANA compact.awk > $@
-
-stdenc.map: mapfiles/stdenc.txt mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@
-
-symbol.map: mapfiles/symbol.txt mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^[0-9A-Fa-f]/' UNICODE compact.awk > $@
-
-CP720.map: mapfiles/CP720.map
-        # Generating $@...
-        @cp $< $@
-
-CP858.map: mapfiles/CP858.map
-        # Generating $@...
-        @cp $< $@
-
-CP949-2BYTE.map: ${GLIBC_CHARMAPS}/CP949.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x[89a-f]/' GLIBC-2 compact.awk > $@
-
-GB2312.map: ${GLIBC_CHARMAPS}/GB2312.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
-
-GBK.map: ${GLIBC_CHARMAPS}/GBK.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x[89a-f]/' GLIBC-2 compact.awk > $@
-
-GB180302.map: ${GLIBC_CHARMAPS}/GB18030.gz mapconv gb180302.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x..\/x..[    ]/' GLIBC-2 gb180302.awk > $@
-
-GB180304.map: GB180302.map gb180304.awk
-        # Generating $@...
-        @$(AWK) -f gb180304.awk < $< > $@
-
-JISX0201.map: ${GLIBC_CHARMAPS}/JIS_X0201.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x[0-9]/' GLIBC-1 compact.awk > $@
-        @echo "# Generated by hand" >> $@
-        @echo "0xA1-0xDF 0xFF61" >> $@
-
-JISX0208.map: ${GLIBC_CHARMAPS}/EUC-JP.gz mapconv
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x[a-f]/' GLIBC-2-7 \
-          | sed 's/0x2015/0x2014/' > $@
-
-JISX0212.map: ${GLIBC_CHARMAPS}/EUC-JP.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x8f/ s,/x8f,,' GLIBC-2-7 compact.awk > $@
-
-jisx2131-filter: mapfiles/JISX213A.map
-        @sed -n -e '/^#/d' -e 's,.*0x\([0-9A-Z]*\)$$,/0x0*\1$$/d,p' < $< > $@
-
-JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz mapconv jisx2131-filter
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x[a-f]/' GLIBC-2-7 \
-          | sed -f jisx2131-filter \
-          | sed -e 's/0x2015/0x2014/' -e 's/0x2299/0x29BF/' > $@
-
-JISX2132.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz mapconv
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x8f/ s,/x8f,,' GLIBC-2-7 > $@
-
-JISX213A.map: mapfiles/JISX213A.map
-        # Generating $@
-        @cp $<  $@
-
-CP932-2BYTE.map: mapfiles/CP932.TXT mapconv cp932.awk
-        # Generating $@...
-        @./mapconv $< '/^0x[89A-F][0-9A-F][0-9A-F]/' UNICODE2 cp932.awk > $@
-
-cp51932.el: CP932-2BYTE.map cp51932.awk
-        @$(AWK) -f cp51932.awk < CP932-2BYTE.map > $@
-
-eucjp-ms.el: ${GLIBC_CHARMAPS}/EUC-JP-MS.gz eucjp-ms.awk
-        @zcat $< | $(AWK) -f eucjp-ms.awk > $@
-
-JISC6226.map: mapfiles/Uni2JIS mapconv kuten.awk
-        # Generating $@...
-# As Uni2JIS doesn't contain mappings of characters added to Unicode
-# recently, we add them manually here (including one correction for
-# U+005C vs U+FF3C).  These changes are based on bogytech's blog at
-# http://bogytech.blogspot.jp/search/label/emacs.
-        @./mapconv $< '/^[^#].*0-/' YASUOKA kuten.awk \
-          | sed -e '/0x2140/s/005C/FF3C/' \
-                -e '$$ a 0x3442 0x3D4E' \
-                -e '$$ a 0x374E 0x25874' \
-                -e '$$ a 0x3764 0x28EF6' \
-                -e '$$ a 0x513D 0x2F80F' \
-                -e '$$ a 0x7045 0x9724' > $@
-
-KSC5601.map: ${GLIBC_CHARMAPS}/EUC-KR.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
-
-BIG5.map: ${GLIBC_CHARMAPS}/BIG5.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x[a-f]/' GLIBC-2 > $@
-
-BIG5-1.map: BIG5.map mapconv big5.awk
-        # Generating $@...
-        @echo "# Generated from $<" > $@
-        @sed -n -e '/0xa140/,/0xc8fe/p' < $< | gawk -f big5.awk >> $@
-
-BIG5-2.map: BIG5.map mapconv big5.awk
-        # Generating $@...
-        @echo "# Generated from $<" > $@
-        @sed -n -e '/0xc940/,$$ p' < $< | gawk -f big5.awk >> $@
-
-BIG5-HKSCS.map: ${GLIBC_CHARMAPS}/BIG5-HKSCS.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x[89a-f].\//' GLIBC-2 compact.awk > $@
-
-JOHAB.map: ${GLIBC_CHARMAPS}/JOHAB.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x[89a-f]/' GLIBC-2 compact.awk > $@
-
-CNS-1.map: ${GLIBC_CHARMAPS}/EUC-TW.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x[a-f]/' GLIBC-2-7 compact.awk > $@
-
-# CNS-1.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
-#       # Generating $@...
-#       @./mapconv $< '/^C1/' KANJI-DATABASE compact.awk > $@
-
-CNS-2.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^C2/' KANJI-DATABASE compact.awk > $@
-
-CNS-3.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^C3/' KANJI-DATABASE compact.awk > $@
-
-CNS-4.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^C4/' KANJI-DATABASE compact.awk > $@
-
-CNS-5.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^C5/' KANJI-DATABASE compact.awk > $@
-
-CNS-6.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^C6/' KANJI-DATABASE compact.awk > $@
-
-CNS-7.map: mapfiles/cns2ucsdkw.txt mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^C7/' KANJI-DATABASE compact.awk > $@
-
-CNS-F.map: ${GLIBC_CHARMAPS}/EUC-TW.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*\/x8e\/xaf/ s,/x8e/xaf,,' GLIBC-2-7 compact.awk > $@
-
-# General target to produce map files for mule charsets.
-MULE-%.map: mapfiles/MULE-%.map
-        # Generating $@...
-        @cp $< $@
-
-# General target to produce map files for ISO-8859, GEORGIAN, and
-# EBCDIC charsets.  We can not use the original file name because of
-# file name limit on DOS.  "KA" is ISO 639 language code for Georgian.
-
-8859-%.map: ${GLIBC_CHARMAPS}/ISO-8859-%.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x/' GLIBC-1 compact.awk > $@
-
-KA-%.map: ${GLIBC_CHARMAPS}/GEORGIAN-%.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x/' GLIBC-1 compact.awk > $@
-
-EBCDIC%.map: ${GLIBC_CHARMAPS}/EBCDIC-%.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x/' GLIBC-1 compact.awk > $@
-
-# General target to produce map files for single-byte charsets.
-
-%.map: ${GLIBC_CHARMAPS}/%.gz mapconv compact.awk
-        # Generating $@...
-        @./mapconv $< '/^<.*[   ]\/x/' GLIBC-1 compact.awk > $@
-
-install:
-        @for f in ${CHARSETS}; do \
-          if test -r $$f; then \
-            if ! cmp -s $$f ../../etc/charsets/$$f; then \
-              echo updating $$f; \
-              cp $$f ../../etc/charsets; \
-            fi; \
-          fi; \
-        done
-        @for f in ${TRANS_TABLE}; do \
-          if test -r $$f; then \
-            if ! cmp -s $$f ../../lisp/international/$$f; then \
-              echo updating $$f; \
-              cp $$f ../../lisp/international; \
-            fi; \
-          fi; \
-        done
-
-# Clear files that are automatically generated.
-clean:
-        rm -f ${CHARSETS} ${TRANS_TABLE} ${SED_SCRIPT}
-
diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in
new file mode 100644
index 00000000000..13de84d6c07
--- /dev/null
+++ b/admin/charsets/Makefile.in
@@ -0,0 +1,336 @@
+### @configure_input@
+
+# Copyright (C) 2015 Free Software Foundation, Inc.
+
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+#   National Institute of Advanced Industrial Science and Technology (AIST)
+#   Registration Number H13PRO009
+#
+# This file is part of GNU Emacs.
+
+# GNU Emacs is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+### Commentary:
+
+# Generate charset maps in etc/charsets.
+
+#  If your system doesn't have the directory /usr/share/i18n/charmaps,
+#  get the source of the latest glibc, gzip all the charmap files in
+#  the directory "localedate/charmaps", and set the variable
+#  GLIBC_CHARMAPS to that directory.
+
+SHELL = @SHELL@
+
+AWK = @AWK@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+
+charsetdir = ${top_srcdir}/etc/charsets
+lispintdir = ${top_srcdir}/lisp/international
+mapfiledir = ${srcdir}/mapfiles
+
+GLIBC_CHARMAPS=/usr/share/i18n/charmaps
+
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 =
+
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
+
+# Note: We can not prepend "ISO-" to these map files because of file
+# name limits on DOS.
+ISO8859 = \
+        8859-2.map 8859-3.map 8859-4.map 8859-5.map 8859-6.map 8859-7.map \
+        8859-8.map 8859-9.map 8859-10.map 8859-11.map 8859-13.map 8859-14.map \
+        8859-15.map 8859-16.map
+
+IBM = \
+        IBM037.map IBM038.map \
+        IBM256.map IBM273.map IBM274.map IBM275.map IBM277.map IBM278.map \
+        IBM280.map IBM281.map IBM284.map IBM285.map IBM290.map IBM297.map \
+        IBM420.map IBM423.map IBM424.map IBM437.map IBM500.map IBM850.map \
+        IBM851.map IBM852.map IBM855.map IBM856.map IBM857.map IBM860.map \
+        IBM861.map IBM862.map IBM863.map IBM864.map IBM865.map IBM866.map \
+        IBM868.map IBM869.map IBM870.map IBM871.map IBM874.map IBM875.map \
+        IBM880.map IBM891.map IBM903.map IBM904.map IBM905.map IBM918.map \
+        IBM1004.map IBM1026.map IBM1047.map
+
+CODEPAGE = \
+        CP737.map CP775.map CP1125.map\
+        CP1250.map CP1251.map CP1252.map CP1253.map CP1254.map \
+        CP1255.map CP1256.map CP1257.map CP1258.map \
+        CP10007.map \
+        CP720.map CP858.map
+
+CJK =   GB2312.map GBK.map GB180302.map GB180304.map \
+        BIG5.map BIG5-HKSCS.map\
+        CNS-1.map CNS-2.map CNS-3.map CNS-4.map CNS-5.map CNS-6.map CNS-7.map \
+        CNS-F.map \
+        JISX0201.map JISX0208.map JISX0212.map JISX2131.map JISX2132.map \
+        JISC6226.map CP932-2BYTE.map JISX213A.map\
+        KSC5601.map KSC5636.map JOHAB.map
+
+MISC =  KOI-8.map KOI8-R.map KOI8-U.map KOI8-T.map ALTERNATIVNYJ.map \
+        MIK.map PTCP154.map \
+        TIS-620.map VISCII.map VSCII.map VSCII-2.map\
+        KA-PS.map KA-ACADEMY.map \
+        HP-ROMAN8.map NEXTSTEP.map MACINTOSH.map EBCDICUK.map EBCDICUS.map \
+        stdenc.map symbol.map \
+        CP949-2BYTE.map \
+        BIG5-1.map BIG5-2.map
+
+# Emacs-mule charsets.
+MULE =  MULE-ethiopic.map MULE-ipa.map MULE-is13194.map \
+        MULE-sisheng.map MULE-tibetan.map \
+        MULE-lviscii.map MULE-uviscii.map
+
+SED_SCRIPT = jisx2131-filter
+
+TRANS_TABLE = cp51932.el eucjp-ms.el
+TRANS_TABLE := $(addprefix ${lispintdir}/,${TRANS_TABLE})
+
+CHARSETS = ${ISO8859} ${IBM} ${CODEPAGE} ${CJK} ${MISC} ${MULE}
+CHARSETS := $(addprefix ${charsetdir}/,${CHARSETS})
+
+## Those charsets whose source is not in GLIBC_CHARMAPS.
+LOCAL = MIK.map PTCP154.map stdenc.map symbol.map CP720.map CP858.map \
+  JISX213A.map CP932-2BYTE.map JISC6226.map \
+  CNS-2.map CNS-3.map CNS-4.map CNS-5.map CNS-6.map CNS-7.map \
+  ALTERNATIVNYJ.map GB180304.map \
+  ${MULE}
+LOCAL := $(addprefix ${charsetdir}/,${LOCAL})
+
+
+.PHONY: all local
+
+all: ${CHARSETS} ${TRANS_TABLE}
+local: ${LOCAL} ${TRANS_TABLE}
+
+## Rules for each charset.
+
+mapconv = ${srcdir}/mapconv
+run_mapconv = AWK=${AWK} ${srcdir}/mapconv
+big5 = ${srcdir}/big5.awk
+compact = ${srcdir}/compact.awk
+cp51932 = ${srcdir}/cp51932.awk
+cp932 = ${srcdir}/cp932.awk
+eucjp_ms = ${srcdir}/eucjp-ms.awk
+gb180302 = ${srcdir}/gb180302.awk
+gb180304 = ${srcdir}/gb180304.awk
+kuten = ${srcdir}/kuten.awk
+
+## Short aliases, eg VSCII.map = ${charsetdir}/VSCII.map
+define map_template
+ .PHONY: $(notdir ${1})
+ $(notdir ${1}): ${1}
+endef
+
+$(foreach mfile,${CHARSETS},$(eval $(call map_template,$(mfile))))
+
+${charsetdir}/VSCII.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[0-9a-f].[  ]/' GLIBC-1 ${compact} > $@
+
+${charsetdir}/VSCII-2.map: ${GLIBC_CHARMAPS}/TCVN5712-1.gz ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[2-7a-f].[  ]/' GLIBC-1 ${compact} \
+          | sed 's/0x20-0x7F.*/0x00-0x7F 0x0000/' > $@
+
+${charsetdir}/ALTERNATIVNYJ.map: ${charsetdir}/IBM866.map
+        ${AM_V_GEN}(echo "# Modified from $(notdir $<) according to the chart at" && \
+          echo "# http://www.cyrillic.com/ref/cyrillic/koi-8alt.html," && \
+          echo "# with guesses for the Unicodes of the glyphs." && \
+          sed -e '1 d' \
+             -e '/0xF2/ s/ .*/ 0x2019/' \
+             -e '/0xF3/ s/ .*/ 0x2018/' \
+             -e '/0xF4/ s/ .*/ 0x0301/' \
+             -e '/0xF5/ s/ .*/ 0x0300/' \
+             -e '/0xF6/ s/ .*/ 0x203A/' \
+             -e '/0xF7/ s/ .*/ 0x2039/' \
+             -e '/0xF8/ s/ .*/ 0x2191/' \
+             -e '/0xF9/ s/ .*/ 0x2193/' \
+             -e '/0xFA/ s/ .*/ 0x00B1/' \
+             -e '/0xFB/ s/ .*/ 0x00F7/' < $< ) > $@
+
+${charsetdir}/MIK.map: ${mapfiledir}/bulgarian-mik.txt ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '1,$$' CZYBORRA ${compact} > $@
+
+${charsetdir}/PTCP154.map: ${mapfiledir}/PTCP154 ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^0x/' IANA ${compact} > $@
+
+${charsetdir}/stdenc.map: ${mapfiledir}/stdenc.txt ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^[0-9A-Fa-f]/' UNICODE ${compact} > $@
+
+${charsetdir}/symbol.map: ${mapfiledir}/symbol.txt ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^[0-9A-Fa-f]/' UNICODE ${compact} > $@
+
+${charsetdir}/CP720.map: ${mapfiledir}/CP720.map
+        ${AM_V_GEN}cp $< $@
+
+${charsetdir}/CP858.map: ${mapfiledir}/CP858.map
+        ${AM_V_GEN}cp $< $@
+
+${charsetdir}/CP949-2BYTE.map: ${GLIBC_CHARMAPS}/CP949.gz ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[89a-f]/' GLIBC-2 ${compact} > $@
+
+${charsetdir}/GB2312.map: ${GLIBC_CHARMAPS}/GB2312.gz ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[a-f]/' GLIBC-2-7 ${compact} > $@
+
+${charsetdir}/GBK.map: ${GLIBC_CHARMAPS}/GBK.gz ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[89a-f]/' GLIBC-2 ${compact} > $@
+
+${charsetdir}/GB180302.map: ${GLIBC_CHARMAPS}/GB18030.gz ${mapconv} ${gb180302}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x..\/x..[    ]/' GLIBC-2 ${gb180302} > $@
+
+${charsetdir}/GB180304.map: ${charsetdir}/GB180302.map ${gb180304}
+        ${AM_V_GEN}$(AWK) -f ${gb180304} < $< > $@
+
+${charsetdir}/JISX0201.map: ${GLIBC_CHARMAPS}/JIS_X0201.gz ${mapconv} ${compact}
+        ${AM_V_GEN}(${mapconv} $< '/^<.*[       ]\/x[0-9]/' GLIBC-1 ${compact} && \
+          echo "# Generated by hand" && \
+          echo "0xA1-0xDF 0xFF61" ) > $@
+
+${charsetdir}/JISX0208.map: ${GLIBC_CHARMAPS}/EUC-JP.gz ${mapconv}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[a-f]/' GLIBC-2-7 \
+          | sed 's/0x2015/0x2014/' > $@
+
+${charsetdir}/JISX0212.map: ${GLIBC_CHARMAPS}/EUC-JP.gz ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x8f/ s,/x8f,,' GLIBC-2-7 ${compact} > $@
+
+jisx2131-filter: ${mapfiledir}/JISX213A.map
+        ${AM_V_at}sed -n -e '/^#/d' -e 's,.*0x\([0-9A-Z]*\)$$,/0x0*\1$$/d,p' < $< > $@
+
+${charsetdir}/JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv} jisx2131-filter
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[a-f]/' GLIBC-2-7 \
+          | sed -f jisx2131-filter \
+          | sed -e 's/0x2015/0x2014/' -e 's/0x2299/0x29BF/' > $@
+
+${charsetdir}/JISX2132.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x8f/ s,/x8f,,' GLIBC-2-7 > $@
+
+${charsetdir}/JISX213A.map: ${mapfiledir}/JISX213A.map
+        ${AM_V_GEN}cp $< $@
+
+${charsetdir}/CP932-2BYTE.map: ${mapfiledir}/CP932.TXT ${mapconv} ${cp932}
+        ${AM_V_GEN}${run_mapconv} $< '/^0x[89A-F][0-9A-F][0-9A-F]/' UNICODE2 ${cp932} > $@
+
+${lispintdir}/cp51932.el: ${charsetdir}/CP932-2BYTE.map ${cp51932}
+        ${AM_V_GEN}$(AWK) -f ${cp51932} < $< > $@
+
+${lispintdir}/eucjp-ms.el: ${GLIBC_CHARMAPS}/EUC-JP-MS.gz ${eucjp_ms}
+        ${AM_V_GEN}gunzip -c $< | $(AWK) -f ${eucjp_ms} > $@
+
+# As Uni2JIS doesn't contain mappings of characters added to Unicode
+# recently, we add them manually here (including one correction for
+# U+005C vs U+FF3C).  These changes are based on bogytech's blog at
+# http://bogytech.blogspot.jp/search/label/emacs.
+${charsetdir}/JISC6226.map: ${mapfiledir}/Uni2JIS ${mapconv} ${kuten}
+        ${AM_V_GEN}(${run_mapconv} $< '/^[^#].*0-/' YASUOKA ${kuten} \
+          | sed -e '/0x2140/s/005C/FF3C/' && \
+          echo '0x3442 0x3D4E' && echo '0x374E 0x25874' && \
+          echo '0x3764 0x28EF6' && echo '0x513D 0x2F80F' && \
+          echo '0x7045 0x9724' ) > $@
+
+${charsetdir}/KSC5601.map: ${GLIBC_CHARMAPS}/EUC-KR.gz ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[a-f]/' GLIBC-2-7 ${compact} > $@
+
+${charsetdir}/BIG5.map: ${GLIBC_CHARMAPS}/BIG5.gz ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[a-f]/' GLIBC-2 > $@
+
+${charsetdir}/BIG5-1.map: ${charsetdir}/BIG5.map ${mapconv} ${big5}
+        ${AM_V_GEN}(echo "# Generated from $(notdir $<)" && \
+          sed -n -e '/0xa140/,/0xc8fe/p' < $< | $(AWK) -f ${big5} ) > $@
+
+${charsetdir}/BIG5-2.map: ${charsetdir}/BIG5.map ${mapconv} ${big5}
+        ${AM_V_GEN}(echo "# Generated from $(notdir $<)" && \
+          sed -n -e '/0xc940/,$$ p' < $< | $(AWK) -f ${big5} ) > $@
+
+${charsetdir}/BIG5-HKSCS.map: ${GLIBC_CHARMAPS}/BIG5-HKSCS.gz ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[89a-f].\//' GLIBC-2 ${compact} > $@
+
+${charsetdir}/JOHAB.map: ${GLIBC_CHARMAPS}/JOHAB.gz ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[89a-f]/' GLIBC-2 ${compact} > $@
+
+${charsetdir}/CNS-1.map: ${GLIBC_CHARMAPS}/EUC-TW.gz ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x[a-f]/' GLIBC-2-7 ${compact} > $@
+
+# ${charsetdir}/CNS-1.map: ${mapfiledir}/cns2ucsdkw.txt ${mapconv} ${compact}
+#       ${AM_V_GEN}${run_mapconv} $< '/^C1/' KANJI-DATABASE ${compact} > $@
+
+${charsetdir}/CNS-2.map: ${mapfiledir}/cns2ucsdkw.txt ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^C2/' KANJI-DATABASE ${compact} > $@
+
+${charsetdir}/CNS-3.map: ${mapfiledir}/cns2ucsdkw.txt ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^C3/' KANJI-DATABASE ${compact} > $@
+
+${charsetdir}/CNS-4.map: ${mapfiledir}/cns2ucsdkw.txt ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^C4/' KANJI-DATABASE ${compact} > $@
+
+${charsetdir}/CNS-5.map: ${mapfiledir}/cns2ucsdkw.txt ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^C5/' KANJI-DATABASE ${compact} > $@
+
+${charsetdir}/CNS-6.map: ${mapfiledir}/cns2ucsdkw.txt ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^C6/' KANJI-DATABASE ${compact} > $@
+
+${charsetdir}/CNS-7.map: ${mapfiledir}/cns2ucsdkw.txt ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^C7/' KANJI-DATABASE ${compact} > $@
+
+${charsetdir}/CNS-F.map: ${GLIBC_CHARMAPS}/EUC-TW.gz ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*\/x8e\/xaf/ s,/x8e/xaf,,' GLIBC-2-7 ${compact} > $@
+
+# General target to produce map files for mule charsets.
+${charsetdir}/MULE-%.map: ${mapfiledir}/MULE-%.map
+        ${AM_V_GEN}cp $< $@
+
+# General target to produce map files for ISO-8859, GEORGIAN, and
+# EBCDIC charsets.  We can not use the original file name because of
+# file name limit on DOS.  "KA" is ISO 639 language code for Georgian.
+
+${charsetdir}/8859-%.map: ${GLIBC_CHARMAPS}/ISO-8859-%.gz ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x/' GLIBC-1 ${compact} > $@
+
+${charsetdir}/KA-%.map: ${GLIBC_CHARMAPS}/GEORGIAN-%.gz ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x/' GLIBC-1 ${compact} > $@
+
+${charsetdir}/EBCDIC%.map: ${GLIBC_CHARMAPS}/EBCDIC-%.gz ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x/' GLIBC-1 ${compact} > $@
+
+# General target to produce map files for single-byte charsets.
+
+${charsetdir}/%.map: ${GLIBC_CHARMAPS}/%.gz ${mapconv} ${compact}
+        ${AM_V_GEN}${run_mapconv} $< '/^<.*[    ]\/x/' GLIBC-1 ${compact} > $@
+
+
+.PHONY: clean bootstrap-clean distclean maintainer-clean extraclean totalclean
+
+clean:
+        rm -f ${SED_SCRIPT}
+
+bootstrap-clean: clean
+
+distclean: clean
+        rm -f Makefile
+
+maintainer-clean: distclean
+
+## Do not remove these files, even in a bootstrap.  They rarely change.
+extraclean:
+        rm -f ${LOCAL} ${TRANS_TABLE}
+
+totalclean: extraclean
+        rm -f ${CHARSETS}
diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv
index 8433d222b8d..6fd13c61c4a 100755
--- a/admin/charsets/mapconv
+++ b/admin/charsets/mapconv
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# Copyright (C) 2015 Free Software Foundation, Inc.
+
 # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
@@ -33,8 +35,10 @@
 #       GLIBC-1 GLIBC-2 GLIBC-2-7 CZYBORRA IANA UNICODE UNICODE2 YASUOKA
 #   $4: awk script
 
-FILE="admin/charsets/$1"
-BASE=`basename $1 .gz`
+BASE=`expr "$1" : '.*/\(.*\)' '|' "$1"` # basename
+FILE="admin/charsets/mapfiles/$BASE"
+BASE=`expr "$BASE" : '\(.*\)\.gz$' '|' "$BASE"` # remove any .gz suffix
+AWK=${AWK:-awk}
 
 case "$3" in
     GLIBC*)
@@ -69,7 +73,7 @@ fi
 
 if [ -n "$4" ] ; then
     if [ -f "$4" ] ; then
-        AWKPROG="gawk -f $4"
+        AWKPROG="$AWK -f $4"
     else
         echo "Awk program does not exist: $4"
         exit 1
@@ -81,20 +85,20 @@ fi
 if [ "$3" = "GLIBC-1" ] ; then
     # Source format is:
     #   <UYYYY> /xXX
-    zcat $1 | sed -n -e "$2 p" \
+    gunzip -c $1 | sed -n -e "${2}p" \
         | sed -e 's,<U\([^>]*\)>[       ]*/x\(..\).*,0x\2 0x\1,' \
         | sort | ${AWKPROG}
 elif [ "$3" = "GLIBC-2" ] ; then
     # Source format is:
     #   <UYYYY> /xXX/xZZ
-    zcat $1 | sed -n -e "$2 p" \
+    gunzip -c $1 | sed -n -e "${2}p" \
         | sed -e 's,<U\([^>]*\)>[       ]*/x\(..\)/x\(..\).*,0x\2\3 0x\1,' \
         | sort | ${AWKPROG}
 elif [ "$3" = "GLIBC-2-7" ] ; then
     # Source format is:
     #   <UYYYY> /xXX/xZZ
     # We must drop MSBs of XX and ZZ
-    zcat $1 | sed -n -e "$2 p" \
+    gunzip -c $1 | sed -n -e "${2}p" \
         | sed -e 's/xa/x2/g' -e 's/xb/x3/g' -e 's/xc/x4/g' \
               -e 's/xd/x5/g' -e 's/xe/x6/g' -e 's/xf/x7/g' \
               -e 's,<U\([^>]*\)>[       ]*/x\(..\)/x\(..\).*,0x\2\3 0x\1,' \
@@ -102,13 +106,13 @@ elif [ "$3" = "GLIBC-2-7" ] ; then
 elif [ "$3" = "CZYBORRA" ] ; then
     # Source format is:
     #   =XX     U+YYYY
-    sed -n -e "$2 p" < $1 \
+    sed -n -e "${2}p" < $1 \
         | sed -e 's/=\(..\)[^U]*U+\([0-9A-F]*\).*/0x\1 0x\2/' \
         | sort | ${AWKPROG}
 elif [ "$3" = "IANA" ] ; then
     # Source format is:
     #   0xXX    0xYYYY
-    sed -n -e "$2 p" < $1 \
+    sed -n -e "${2}p" < $1 \
         | sed -e 's/\(0x[0-9A-Fa-f]*\)[^0]*\(0x[0-9A-Fa-f]*\).*/\1 \2/' \
         | sort | ${AWKPROG}
 elif [ "$3" = "UNICODE" ] ; then
@@ -116,25 +120,25 @@ elif [ "$3" = "UNICODE" ] ; then
     #   YYYY    XX
     # We perform reverse sort to prefer the first one in the
     # duplicated mappings (e.g. 0x20->U+0020, 0x20->U+00A0).
-    sed -n -e "$2 p" < $1 \
+    sed -n -e "${2}p" < $1 \
         | sed -e 's/\([0-9A-F]*\)[^0-9A-F]*\([0-9A-F]*\).*/0x\2 0x\1/' \
         | sort -r
 elif [ "$3" = "UNICODE2" ] ; then
     # Source format is:
     #   0xXXXX  0xYYYY  # ...
-    sed -n -e "$2 p" < $1 \
+    sed -n -e "${2}p" < $1 \
         | sed -e 's/\([0-9A-Fx]*\)[^0]*\([0-9A-Fx]*\).*/\1 \2/' \
         | ${AWKPROG} | sort -n -k 4,4
 elif [ "$3" = "YASUOKA" ] ; then
     # Source format is:
     # YYYY      0-XXXX (XXXX is a Kuten code)
-    sed -n -e "$2 p" < $1 \
+    sed -n -e "${2}p" < $1 \
         | sed -e 's/\([0-9A-F]*\)[^0]*0-\([0-9]*\).*/0x\2 0x\1/' \
         | sort | ${AWKPROG}
 elif [ "$3" = "KANJI-DATABASE" ] ; then
     # Source format is:
     # C?-XXXX U+YYYYY .....
-    sed -n -e "$2 p" < $1 \
+    sed -n -e "${2}p" < $1 \
         | sed -e 's/...\(....\) U+\([0-9A-F]*\).*/0x\1 0x\2/' \
         | sort | ${AWKPROG}
 else
diff --git a/admin/charsets/mapfiles/PTCP154 b/admin/charsets/mapfiles/PTCP154
index 1d76058db84..ab493e577dd 100644
--- a/admin/charsets/mapfiles/PTCP154
+++ b/admin/charsets/mapfiles/PTCP154
@@ -288,4 +288,4 @@ e-mail: auskov&idc.kz
 Intended usage:

 COMMON

 

-(record created 2002-09-27)
\ No newline at end of file
+(record created 2002-09-27)

diff --git a/configure.ac b/configure.ac
index 1cddeb1e45f..752204c3a8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5247,7 +5247,8 @@ fi
 
 dnl The admin/ directory used to be excluded from tarfiles.
 if test -d $srcdir/admin; then
-  SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES admin/unidata/Makefile admin/grammars/Makefile"
+  SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES admin/charsets/Makefile admin/unidata/Makefile admin/grammars/Makefile"
+  AC_CONFIG_FILES([admin/charsets/Makefile])
   AC_CONFIG_FILES([admin/unidata/Makefile])
   AC_CONFIG_FILES([admin/grammars/Makefile])
 fi                              dnl -d admin