Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Mar 2023 04:30:22 GMT
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: dc6df546be29 - main - i18n: csmapper: hook up the top-level .src files to the build
Message-ID:  <202303010430.3214UM2W011370@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=dc6df546be29a468ae21b1b7604e85b703ad6779

commit dc6df546be29a468ae21b1b7604e85b703ad6779
Author:     Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2023-03-01 04:24:54 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2023-03-01 04:26:44 +0000

    i18n: csmapper: hook up the top-level .src files to the build
    
    The top-level charset.pivot.src may be empty, but the top-level
    mapper.dir.src is not -- it contains some definitions for supplementary
    UCS planes.  The SMP/SSP definitions aren't actually used at the moment,
    but the inclusion of the SIP definitions fixes conversions involving
    JISX0213-1/JISX0213-2 to be possible.
    
    Sponsored by:   Klara, Inc.
---
 share/i18n/csmapper/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/i18n/csmapper/Makefile b/share/i18n/csmapper/Makefile
index 7c6aca31c019..22c6d9014930 100644
--- a/share/i18n/csmapper/Makefile
+++ b/share/i18n/csmapper/Makefile
@@ -10,7 +10,7 @@ SUBDIR_PARALLEL=
 mapper.dir: ${SUBDIR}
 	newfile=$$(for i in ${SUBDIR}; do \
 		cat $$i/mapper.dir.$$i; \
-	done); \
+	done; cat ${.CURDIR}/mapper.dir.src); \
 	[ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \
 		printf '%s\n' "$$newfile" >${.TARGET}
 mapper.dir.db: mapper.dir
@@ -22,7 +22,7 @@ CLEANFILES+= mapper.dir mapper.dir.db
 charset.pivot: ${SUBDIR}
 	newfile=$$(for i in ${SUBDIR}; do \
 		cat $$i/charset.pivot.$$i; \
-	done); \
+	done; cat ${.CURDIR}/charset.pivot.src); \
 	[ "$$newfile" = "$$(cat ${.TARGET} 2>/dev/null)" ] || \
 		printf '%s\n' "$$newfile" >${.TARGET}
 charset.pivot.pvdb: charset.pivot



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202303010430.3214UM2W011370>