Index: head/share/mk/bsd.nls.mk
===================================================================
--- head/share/mk/bsd.nls.mk	(revision 334429)
+++ head/share/mk/bsd.nls.mk	(revision 334430)
@@ -1,86 +1,86 @@
 # $FreeBSD$
 #
 # This include file <bsd.nls.mk> handles building and installing Native
 # Language Support (NLS) catalogs
 #
 # +++ variables +++
 #
 # GENCAT	A program for converting .msg files into compiled NLS
 #		.cat files. [gencat]
 #
 # NLS		Source or intermediate .msg files. [set in Makefile]
 #
 # NLSDIR	Base path for National Language Support files
 #		installation. [${SHAREDIR}/nls]
 #
 # NLSGRP	National Language Support files group. [${SHAREGRP}]
 #
 # NLSMODE	National Language Support files mode. [${NOBINMODE}]
 #
 # NLSOWN	National Language Support files owner. [${SHAREOWN}]
 
 .if !target(__<bsd.init.mk>__)
 .error bsd.nls.mk cannot be included directly.
 .endif
 
 GENCAT?=	gencat
 
 .SUFFIXES: .cat .msg
 
 .msg.cat:
 	${GENCAT} ${.TARGET} ${.IMPSRC}
 
 .if defined(NLS) && !empty(NLS) && ${MK_NLS} != "no"
 
 #
 # .msg file pre-build rules
 #
 NLSSRCDIR?=	${.CURDIR}
 .for file in ${NLS}
 .if defined(NLSSRCFILES)
 NLSSRCFILES_${file}?= ${NLSSRCFILES}
 .endif
 .if defined(NLSSRCFILES_${file})
 NLSSRCDIR_${file}?= ${NLSSRCDIR}
 ${file}.msg: ${NLSSRCFILES_${file}:S/^/${NLSSRCDIR_${file}}\//}
 	@rm -f ${.TARGET}
 	cat ${.ALLSRC} > ${.TARGET}
 CLEANFILES+= ${file}.msg
 .endif
 .endfor
 
 #
 # .cat file build rules
 #
 NLS:=		${NLS:=.cat}
 CLEANFILES+=	${NLS}
 FILESGROUPS?=	FILES
 FILESGROUPS+=	NLS
 NLSDIR?=	${SHAREDIR}/nls
 
 #
 # installation rules
 #
 .if ${MK_STAGING_PROG} == "yes"
 .if !defined(_SKIP_BUILD)
 STAGE_TARGETS+= 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
+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
 .endfor
 .endfor
 
 .endif # defined(NLS) && !empty(NLS) && ${MK_NLS} != "no"