From c28c180131eb3f82e9ada1ed09b439eab9b78cf3 Mon Sep 17 00:00:00 2001 From: zrj Date: Tue, 2 Jan 2018 07:59:15 +0200 Subject: [PATCH] cldr2def: Fix few typos in tools. While there, do not hardcode /usr/src as a source directory. --- tools/tools/locale/Makefile | 10 ++++------ tools/tools/locale/README | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/tools/locale/Makefile b/tools/tools/locale/Makefile index b4860bebd4..6b6220c0c6 100644 --- a/tools/tools/locale/Makefile +++ b/tools/tools/locale/Makefile @@ -40,15 +40,15 @@ install: .for t in ${TYPES} . if ${KNOWN:M${t}} rm -rf ${.CURDIR}/${t}.draft - rm -rf ${DESTDIR}/usr/src/share/${t} - mv ${.CURDIR}/${t} ${DESTDIR}/usr/src/share/ + rm -rf ${.CURDIR}/../../../share/${t} + mv ${.CURDIR}/${t} ${.CURDIR}/../../../share/ . endif .endfor post-install: .for t in ${TYPES} . if ${KNOWN:M${t}} - (cd ${DESTDIR}/usr/src/share/${t} && \ + (cd ${.CURDIR}/../../../share/${t} && \ make && make install && make clean) . endif .endfor @@ -92,8 +92,6 @@ BASE_LOCALES_OF_INTEREST?= \ uk_UA \ kk_Cyrl_KZ mn_Cyrl_MN sr_Cyrl_RS sr_Latn_RS \ zh_Hans_CN zh_Hant_HK zh_Hant_TW \ - \ - \ bn_IN gu_IN or_IN ta_IN te_IN kn_IN ml_IN si_LK \ th_TH lo_LA bo_IN my_MM pa_Guru_IN ka_GE chr_US \ km_KH shi_Tfng_MA ii_CN vai_Vaii_LR vi_VN @@ -119,4 +117,4 @@ POSIX: .endif clean-POSIX: - rm -f {CLDRDIR}/posix/* + rm -f ${CLDRDIR}/posix/* diff --git a/tools/tools/locale/README b/tools/tools/locale/README index b121ae0b3b..6ae1c21023 100644 --- a/tools/tools/locale/README +++ b/tools/tools/locale/README @@ -9,7 +9,7 @@ extract in a directory ~/unicode/cldr/v27.0.1 for example fetch unidata from http://www.unicode.org/Public/zipped/ (latest version) extract in a directory ~/unicode/UNIDATA/8.0.0 for example -either modify tools/tools/locales/etc/unicode.conf or export variables: +either modify tools/tools/locale/etc/unicode.conf or export variables: CLDRDIR="~/unicode/cldr/v27.0.1" UNIDATADIR="~/unicode/UNIDATA/8.0.0" -- 2.41.0