git: ecff3c30b7e4 - main - locales: now that C.UTF-8 is the default locale, always install it

[Baptiste Daroussin]

The branch main has been updated by bapt:

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

commit ecff3c30b7e4ed8883c007b019f90a8128d16441
Author:     Baptiste Daroussin <bapt at FreeBSD.org>
AuthorDate: 2021-07-23 12:15:04 +0000
Commit:     Baptiste Daroussin <bapt at FreeBSD.org>
CommitDate: 2021-07-23 14:58:20 +0000

    locales: now that C.UTF-8 is the default locale, always install it
    
    MFC after:      3 weeks
---
 share/Makefile          | 3 +--
 share/ctypedef/Makefile | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/share/Makefile b/share/Makefile
index dfa5ff1a65a2..5d81f3229760 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -6,7 +6,7 @@
 # Do not include `info' in the SUBDIR list, it is handled separately.
 
 SUBDIR=	${_colldef} \
-	${_ctypedef} \
+	ctypedef \
 	${_dict} \
 	${_doc} \
 	${_dtrace} \
@@ -55,7 +55,6 @@ _i18n=		i18n
 .if ${MK_LOCALES} != "no"
 _colldef=	colldef colldef_unicode
 _monetdef=	monetdef monetdef_unicode
-_ctypedef=	ctypedef
 _msgdef=	msgdef msgdef_unicode
 _numericdef=	numericdef numericdef_unicode
 _timedef=	timedef
diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile
index 89d7e674a39e..4272b4de4f50 100644
--- a/share/ctypedef/Makefile
+++ b/share/ctypedef/Makefile
@@ -6,6 +6,7 @@ FILESNAME=	LC_CTYPE
 MAPLOC=		${.CURDIR}/../../tools/tools/locale/etc/final-maps
 
 .include <bsd.endian.mk>
+.include <src.opts.mk>
 
 .src.LC_CTYPE:
 	localedef ${LOCALEDEF_ENDIAN} -D -U -c -w ${MAPLOC}/widths.txt \
@@ -13,6 +14,7 @@ MAPLOC=		${.CURDIR}/../../tools/tools/locale/etc/final-maps
 	-i ${.IMPSRC} ${.OBJDIR}/${.IMPSRC:T:R}  || true
 
 LOCALES+=	C.UTF-8
+.if ${MK_LOCALES} != no
 LOCALES+=	be_BY.CP1131
 LOCALES+=	ca_IT.ISO8859-1
 LOCALES+=	ca_IT.ISO8859-15
@@ -206,6 +208,7 @@ SAME+=		en_US.US-ASCII en_CA.US-ASCII
 SAME+=		en_US.US-ASCII en_AU.US-ASCII
 SAME+=		lv_LV.ISO8859-13 lt_LT.ISO8859-13
 SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
+.endif
 
 FILES=		${LOCALES:S/$/.LC_CTYPE/}
 CLEANFILES=	${FILES}