From owner-svn-src-projects@FreeBSD.ORG  Thu Jan 17 18:28:26 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id A7187B71;
 Thu, 17 Jan 2013 18:28:26 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 954CA88B;
 Thu, 17 Jan 2013 18:28:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0HISQYQ046126;
 Thu, 17 Jan 2013 18:28:26 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0HISQkL046125;
 Thu, 17 Jan 2013 18:28:26 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201301171828.r0HISQkL046125@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Thu, 17 Jan 2013 18:28:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245564 - projects/bmake/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Jan 2013 18:28:26 -0000

Author: sjg
Date: Thu Jan 17 18:28:26 2013
New Revision: 245564
URL: http://svnweb.freebsd.org/changeset/base/245564

Log:
  Put NLS related symlinks into their own variable, so that
  when MK_STAGING_PROG is true, we can put them in the right place.

Modified:
  projects/bmake/share/mk/bsd.nls.mk

Modified: projects/bmake/share/mk/bsd.nls.mk
==============================================================================
--- projects/bmake/share/mk/bsd.nls.mk	Thu Jan 17 18:26:56 2013	(r245563)
+++ projects/bmake/share/mk/bsd.nls.mk	Thu Jan 17 18:28:26 2013	(r245564)
@@ -61,13 +61,22 @@ NLSDIR?=	${SHAREDIR}/nls
 #
 # installation rules
 #
+.if ${MK_STAGING_PROG} == "yes"
+.if !defined(_SKIP_BUILD)
+all:   stage_symlinks
+.endif
+STAGE_SYMLINKS.NLS= ${NLSSYMLINKS}
+STAGE_SYMLINKS_DIR.NLS= ${STAGE_OBJTOP}
+.else
+SYMLINKS+= ${NLSSYMLINKS}
+.endif
 .for file in ${NLS}
 NLSNAME_${file:T}= ${file:T:R}/${NLSNAME}.cat
 .if defined(NLSLINKS_${file:R}) && !empty(NLSLINKS_${file:R})
 NLSLINKS+=	${file:R}
 .endif
 .for dst in ${NLSLINKS_${file:R}}
-SYMLINKS+=	../${file:R}/${NLSNAME}.cat ${NLSDIR}/${dst}/${NLSNAME}.cat
+NLSSYMLINKS+= ../${file:R}/${NLSNAME}.cat ${NLSDIR}/${dst}/${NLSNAME}.cat
 .endfor
 .endfor