Date: Sat, 13 Dec 2025 04:15:20 +0000 From: Jose Luis Duran <jlduran@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: e1ab892e25f1 - stable/15 - cldr2def.pl: Fix make install Message-ID: <693ce858.3a704.682f90fc@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/15 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=e1ab892e25f10271532719b65aa4e200e7cdba76 commit e1ab892e25f10271532719b65aa4e200e7cdba76 Author: Jose Luis Duran <jlduran@FreeBSD.org> AuthorDate: 2025-12-06 12:20:18 +0000 Commit: Jose Luis Duran <jlduran@FreeBSD.org> CommitDate: 2025-12-13 04:13:44 +0000 cldr2def.pl: Fix make install Follow up on 86c71e97d19f ("pkgbase: locales: Also tag the files dir"), and adapt cldr2def.pl script in order to fix make install. Reviewed by: bapt MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D53961 (cherry picked from commit 95f37aa3e51ce46821059b2c9dbb02fef5c4bec5) --- tools/tools/locale/tools/cldr2def.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl index 998e176de918..f0aaf07c02d9 100755 --- a/tools/tools/locale/tools/cldr2def.pl +++ b/tools/tools/locale/tools/cldr2def.pl @@ -923,6 +923,7 @@ sub make_makefile { ".for f t in \${LOCALES_MAPPED}\n" . "FILES+=\t\$t.LC_COLLATE\n" . "FILESDIR_\$t.LC_COLLATE=\t\${LOCALEDIR}/\$t\n" . + "FILESDIR_\$t.LC_COLLATEPACKAGE=\tlocales\n" . "\$t.LC_COLLATE: \${.CURDIR}/\$f.src\n" . "\tlocaledef \${LOCALEDEF_ENDIAN} -D -U " . "-i \${.ALLSRC} \\\n" . @@ -1102,6 +1103,7 @@ SYMLINKS+= ../\$f/\${FILESNAME} \\ .for f in \${LOCALES} FILESDIR_\${f}.${SRCOUT2}= \${LOCALEDIR}/\${f} +FILESDIR_\${f}.${SRCOUT2}PACKAGE= locales .endfor ${SRCOUT3}.include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?693ce858.3a704.682f90fc>