Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 4 Nov 2018 10:14:08 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r340114 - head/etc
Message-ID:  <201811041014.wA4AE8b9013202@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sun Nov  4 10:14:08 2018
New Revision: 340114
URL: https://svnweb.freebsd.org/changeset/base/340114

Log:
  Simplify NLS alias handling by using native make(1) multi variable for loops

Deleted:
  head/etc/nls.alias
Modified:
  head/etc/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Sun Nov  4 06:59:13 2018	(r340113)
+++ head/etc/Makefile	Sun Nov  4 10:14:08 2018	(r340114)
@@ -4,6 +4,8 @@
 .include <src.opts.mk>
 
 FILESGROUPS=	FILES
+NLS_ALIASES=	POSIX C \
+		en_US.US_ASCII C
 
 # No need as it is empty and just causes rebuilds since this file does so much.
 UPDATE_DEPENDFILE=	no
@@ -182,11 +184,9 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
 .endfor
 .endif
 .if ${MK_NLS} != "no"
-	set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
-	while [ $$# -gt 0 ] ; do \
-		${INSTALL_SYMLINK} "$$2" "${DESTDIR}${SHAREDIR}/nls/$$1"; \
-		shift; shift; \
-	done
+.for alias nls in ${NLS_ALIASES}
+	${INSTALL_SYMLINK} "${nls}" "${DESTDIR}${SHAREDIR}/nls/${alias}"
+.endfor
 .endif
 
 etc-examples: ${META_DEPS}



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