8 files changed, 38 insertions, 31 deletions

diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 0a048c36c36e..c9ae4b8aac4e 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -10,6 +10,7 @@ TCSHDIR=	${.CURDIR}/../../contrib/tcsh
 .PATH: ${TCSHDIR}
 
 PROG=	csh
+SUBDIR= nls
 DFLAGS=	-D_PATH_TCSHELL='"${DESTDIR}/bin/${PROG}"'  
 CFLAGS+= -I${TCSHDIR} -I${.CURDIR} -I. ${DFLAGS}
 SRCS=	sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \
diff --git a/bin/csh/nls/finnish/Makefile b/bin/csh/nls/finnish/Makefile
index 6756537fd53c..93975483914e 100644
--- a/bin/csh/nls/finnish/Makefile
+++ b/bin/csh/nls/finnish/Makefile
@@ -3,7 +3,8 @@
 .include "${.CURDIR}/../Makefile.inc"
 
 NL=     finnish
-DL=	fi_FI.ISO_8859-1 fi_FI.DIS_8859-15
+DL=     fi_FI.ISO_8859-1
+LL=     fi_FI.DIS_8859-15
 
 .PATH: ${BASESRC}/${NL}
 
@@ -16,9 +17,10 @@ tcsh.msg: set[0-9]*
 	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
 
 install:
-.for i in ${DL}
-	 ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-		tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
+.for i in ${LL}
+	ln -fs ../${DL}/tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
 .endfor
 
 .include <bsd.obj.mk>
diff --git a/bin/csh/nls/french/Makefile b/bin/csh/nls/french/Makefile
index 06b3d8590d0c..2ab3f14c0be2 100644
--- a/bin/csh/nls/french/Makefile
+++ b/bin/csh/nls/french/Makefile
@@ -3,8 +3,10 @@
 .include "${.CURDIR}/../Makefile.inc"
 
 NL=     french
-DL= fr_BE.ISO_8859-1 fr_CA.ISO_8859-1 fr_CH.ISO_8859-1 fr_FR.ISO_8859-1 \
-    fr_BE.DIS_8859-15 fr_CA.DIS_8859-15 fr_CH.DIS_8859-15 fr_FR.DIS_8859-15
+DL=     fr_FR.ISO_8859-1
+LL=     fr_BE.ISO_8859-1 fr_CA.ISO_8859-1 fr_CH.ISO_8859-1 \
+	fr_BE.DIS_8859-15 fr_CA.DIS_8859-15 fr_CH.DIS_8859-15 \
+	fr_FR.DIS_8859-15
 
 .PATH: ${BASESRC}/${NL}
 
@@ -17,9 +19,10 @@ tcsh.msg: set[0-9]*
 	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
 
 install:
-.for i in ${DL}
-	 ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-		tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
+.for i in ${LL}
+	ln -fs ../${DL}/tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
 .endfor
 
 .include <bsd.obj.mk>
diff --git a/bin/csh/nls/german/Makefile b/bin/csh/nls/german/Makefile
index f10961123af0..f4c55e205df1 100644
--- a/bin/csh/nls/german/Makefile
+++ b/bin/csh/nls/german/Makefile
@@ -3,8 +3,9 @@
 .include "${.CURDIR}/../Makefile.inc"
 
 NL=     german
-DL=     de_AT.ISO_8859-1 de_CH.ISO_8859-1 de_DE.ISO_8859-1 \
-	de_AT.DIS_8859-15 de_CH.DIS_8859-15 de_DE.DIS_8859-15
+DL=     de_DE.ISO_8859-1
+LL=     de_AT.ISO_8859-1 de_CH.ISO_8859-1 de_AT.DIS_8859-15 \
+	de_CH.DIS_8859-15 de_DE.DIS_8859-15
 
 .PATH: ${BASESRC}/${NL}
 
@@ -17,9 +18,10 @@ tcsh.msg: set[0-9]*
 	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
 
 install:
-.for i in ${DL}
-	 ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-		tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
+.for i in ${LL}
+	ln -fs ../${DL}/tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
 .endfor
 
 .include <bsd.obj.mk>
diff --git a/bin/csh/nls/greek/Makefile b/bin/csh/nls/greek/Makefile
index af20ee2188b1..1809d8decf93 100644
--- a/bin/csh/nls/greek/Makefile
+++ b/bin/csh/nls/greek/Makefile
@@ -16,9 +16,7 @@ tcsh.msg: set[0-9]*
 	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
 
 install:
-.for i in ${DL}
-	 ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-		tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
-.endfor
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
 
 .include <bsd.obj.mk>
diff --git a/bin/csh/nls/italian/Makefile b/bin/csh/nls/italian/Makefile
index 5cf35642e995..0f97290d760b 100644
--- a/bin/csh/nls/italian/Makefile
+++ b/bin/csh/nls/italian/Makefile
@@ -3,8 +3,8 @@
 .include "${.CURDIR}/../Makefile.inc"
 
 NL=     italian
-DL=     it_IT.ISO_8859-1 it_CH.ISO_8859-1 \
-	it_IT.DIS_8859-15 it_CH.DIS_8859-15
+DL=     it_IT.ISO_8859-1
+LL=     it_CH.ISO_8859-1 it_IT.DIS_8859-15 it_CH.DIS_8859-15
 
 .PATH: ${BASESRC}/${NL}
 
@@ -17,9 +17,10 @@ tcsh.msg: set[0-9]*
 	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
 
 install:
-.for i in ${DL}
-	 ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-		tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
+.for i in ${LL}
+	ln -fs ../${DL}/tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
 .endfor
 
 .include <bsd.obj.mk>
diff --git a/bin/csh/nls/ja/Makefile b/bin/csh/nls/ja/Makefile
index 2b29fa296280..a8e1d573e909 100644
--- a/bin/csh/nls/ja/Makefile
+++ b/bin/csh/nls/ja/Makefile
@@ -16,9 +16,7 @@ tcsh.msg: set[0-9]*
 	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
 
 install:
-.for i in ${DL}
-	 ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-		tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
-.endfor
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
 
 .include <bsd.obj.mk>
diff --git a/bin/csh/nls/spanish/Makefile b/bin/csh/nls/spanish/Makefile
index c0bc15458e9c..9ddff7983b6e 100644
--- a/bin/csh/nls/spanish/Makefile
+++ b/bin/csh/nls/spanish/Makefile
@@ -3,7 +3,8 @@
 .include "${.CURDIR}/../Makefile.inc"
 
 NL=     spanish
-DL=     es_ES.ISO_8859-1 es_ES.DIS_8859-15
+DL=     es_ES.ISO_8859-1
+LL=     es_ES.DIS_8859-15
 
 .PATH: ${BASESRC}/${NL}
 
@@ -16,9 +17,10 @@ tcsh.msg: set[0-9]*
 	    ${BASESRC}/${NL}/set[0-9][0-9] > ${.TARGET}
 
 install:
-.for i in ${DL}
-	 ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-		tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
+		tcsh.cat ${DESTDIR}${NLSDIR}/${DL}/tcsh.cat
+.for i in ${LL}
+	ln -fs ../${DL}/tcsh.cat ${DESTDIR}${NLSDIR}/$i/tcsh.cat
 .endfor
 
 .include <bsd.obj.mk>