From owner-svn-src-head@freebsd.org  Thu May 31 13:26:13 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4FDFAFC7670;
 Thu, 31 May 2018 13:26:13 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 233AF8538F;
 Thu, 31 May 2018 13:26:13 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0456B1ABFB;
 Thu, 31 May 2018 13:26:13 +0000 (UTC) (envelope-from brd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4VDQCsZ089802;
 Thu, 31 May 2018 13:26:12 GMT (envelope-from brd@FreeBSD.org)
Received: (from brd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4VDQCVx089801;
 Thu, 31 May 2018 13:26:12 GMT (envelope-from brd@FreeBSD.org)
Message-Id: <201805311326.w4VDQCVx089801@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org
 using -f
From: Brad Davis <brd@FreeBSD.org>
Date: Thu, 31 May 2018 13:26:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r334430 - head/share/mk
X-SVN-Group: head
X-SVN-Commit-Author: brd
X-SVN-Commit-Paths: head/share/mk
X-SVN-Commit-Revision: 334430
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 May 2018 13:26:13 -0000

Author: brd
Date: Thu May 31 13:26:12 2018
New Revision: 334430
URL: https://svnweb.freebsd.org/changeset/base/334430

Log:
  Move all of the directory path into the DIR part of the component and make the
  NAME be only the filename.
  
  This makes it possible to use the DIR as part of the dep in the future.
  
  Approved by:	bapt (mentor)

Modified:
  head/share/mk/bsd.nls.mk

Modified: head/share/mk/bsd.nls.mk
==============================================================================
--- head/share/mk/bsd.nls.mk	Thu May 31 13:17:34 2018	(r334429)
+++ head/share/mk/bsd.nls.mk	Thu May 31 13:26:12 2018	(r334430)
@@ -71,12 +71,12 @@ STAGE_SYMLINKS_DIR.NLS= ${STAGE_OBJTOP}
 SYMLINKS+= ${NLSSYMLINKS}
 .endif
 .for file in ${NLS}
-NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
+NLSDIR_${file:T}=	${NLSDIR}/${file:T:R}
+NLSNAME_${file:T}=	${NLSNAME}.cat
 .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
 .if !empty(NLSLINKS_${file:R}:M${file:R})
 .error NLSLINKS_${file:R} contains itself: ${file:R}
 .endif
-NLSLINKS+=	${file:R}
 .endif
 .for dst in ${NLSLINKS_${file:R}}
 NLSSYMLINKS+= ../${file:R}/${NLSNAME}.cat ${NLSDIR}/${dst}/${NLSNAME}.cat