Date: Thu, 17 Jan 2013 18:28:26 +0000 (UTC) From: "Simon J. Gerraty" <sjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245564 - projects/bmake/share/mk Message-ID: <201301171828.r0HISQkL046125@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301171828.r0HISQkL046125>