From 0e0fd0c38fd57ee206a681d96775f0014357eb71 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Thu, 27 Apr 2023 18:50:47 +0800 Subject: [PATCH] Fix bootstrap on Unix * admin/charsets/Makefile.in (${charsetdir}/JISX0201.map): Use run_mapconv, which uses the correct awk. * admin/charsets/mapconv (LC_ALL): Don't place assignment in same line as export. --- admin/charsets/Makefile.in | 2 +- admin/charsets/mapconv | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in index 4c62bb19dc5..efb9106adad 100644 --- a/admin/charsets/Makefile.in +++ b/admin/charsets/Makefile.in @@ -181,7 +181,7 @@ ${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} && \ + ${AM_V_GEN}(${run_mapconv} $< '/^<.*[ ]\/x[0-9]/' GLIBC-1 ${compact} && \ echo "# Generated by hand" && \ echo "0xA1-0xDF 0xFF61" ) > $@ diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv index 4a68d3da53b..f44d72d3850 100755 --- a/admin/charsets/mapconv +++ b/admin/charsets/mapconv @@ -38,7 +38,8 @@ ## So that eg [A-F] as used by KANJI-DATABASE branch below works as expected. ## Otherwise with LANG=en_US.utf8, CNS-6.map was generated with a ## bogus entry. By experiment, LC_COLLATE=C was not enough. -export LC_ALL=C +LC_ALL=c +export LC_ALL BASE=`expr "$1" : '.*/\(.*\)' '|' "$1"` # basename FILE="admin/charsets/mapfiles/$BASE" -- 2.39.5