From owner-svn-src-user@FreeBSD.ORG  Sun Sep 13 21:52:36 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EFB85106566B;
	Sun, 13 Sep 2009 21:52:36 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DF5C08FC16;
	Sun, 13 Sep 2009 21:52:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8DLqaO5032805;
	Sun, 13 Sep 2009 21:52:36 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8DLqa7R032803;
	Sun, 13 Sep 2009 21:52:36 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <200909132152.n8DLqa7R032803@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Sun, 13 Sep 2009 21:52:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197180 - user/edwin/locale/share
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Sep 2009 21:52:37 -0000

Author: edwin
Date: Sun Sep 13 21:52:36 2009
New Revision: 197180
URL: http://svn.freebsd.org/changeset/base/197180

Log:
  Not only take the list of charactermaps from the CMS_xx variables,
  but also from the CMSLINK_xx variables.

Modified:
  user/edwin/locale/share/Makefile.def.inc

Modified: user/edwin/locale/share/Makefile.def.inc
==============================================================================
--- user/edwin/locale/share/Makefile.def.inc	Sun Sep 13 21:51:13 2009	(r197179)
+++ user/edwin/locale/share/Makefile.def.inc	Sun Sep 13 21:52:36 2009	(r197180)
@@ -23,6 +23,11 @@ CMS=UTF-8
 CMS+=	${cm}
 .  endif
 . endfor
+. for cm in ${CMSLINK_${ccln}}
+.  if ${CMS:M${cm}} == ""
+CMS+=	${cm}
+.  endif
+. endfor
 .endfor
 
 # All files generated and their locations