diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index 765abf9747f3..66487fb76984 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -133,9 +133,9 @@ SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 FILES=		${LOCALES:S/$/.LC_COLLATE/}
 CLEANFILES=	${FILES}
 
-DIRS+=	SAMEDIRS
 .for f t in ${SAME}
-SAMEDIRS+=	${LOCALEDIR}/$t
+DIRS+=	LOCALEDIR_$t
+LOCALEDIR_$t=	${LOCALEDIR}/$t
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/share/colldef_unicode/Makefile b/share/colldef_unicode/Makefile
index 4dd4bf78a36f..ea895d8e388e 100644
--- a/share/colldef_unicode/Makefile
+++ b/share/colldef_unicode/Makefile
@@ -104,9 +104,9 @@ SAME+=		zh_TW.UTF-8 zh_HK.UTF-8
 FILES=		${LOCALES:S/$/.LC_COLLATE/}
 CLEANFILES=	${FILES}
 
-DIRS+=		SAMEDIRS
 .for f t in ${SAME}
-SAMEDIRS+=	${LOCALEDIR}/$t
+DIRS+=	LOCALEDIR_$t
+LOCALEDIR_$t=	${LOCALEDIR}/$t
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile
index ad7eb237f3eb..1a57cfeb1444 100644
--- a/share/ctypedef/Makefile
+++ b/share/ctypedef/Makefile
@@ -215,9 +215,9 @@ SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 FILES=		${LOCALES:S/$/.LC_CTYPE/}
 CLEANFILES=	${FILES}
 
-DIRS+=	SAMEDIRS
 .for f t in ${SAME}
-SAMEDIRS+=	${LOCALEDIR}/$t
+DIRS+=	LOCALEDIR_$t
+LOCALEDIR_$t=	${LOCALEDIR}/$t
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile
index f0b34998f4bd..bec0b78d9433 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -129,9 +129,9 @@ SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 FILES=		${LOCALES:S/$/.out/}
 CLEANFILES=	${FILES}
 
-DIRS+=	SAMEDIRS
 .for f t in ${SAME}
-SAMEDIRS+=	${LOCALEDIR}/$t
+DIRS+=		LOCALEDIR_$t
+LOCALEDIR_$t=	${LOCALEDIR}/$t
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/share/monetdef_unicode/Makefile b/share/monetdef_unicode/Makefile
index 4655c742669b..2fa073f3981d 100644
--- a/share/monetdef_unicode/Makefile
+++ b/share/monetdef_unicode/Makefile
@@ -96,9 +96,9 @@ SAME+=		sr_RS.UTF-8@latin sr_RS.UTF-8
 FILES=		${LOCALES:S/$/.out/}
 CLEANFILES=	${FILES}
 
-DIRS+=		SAMEDIRS
 .for f t in ${SAME}
-SAMEDIRS+=	${LOCALEDIR}/$t
+DIRS+=		LOCALEDIR_$t
+LOCALEDIR_$t=	${LOCALEDIR}/$t
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index 9f0b7f2f3bcf..a176d30c01fc 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -122,9 +122,9 @@ SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 FILES=		${LOCALES:S/$/.out/}
 CLEANFILES=	${FILES}
 
-DIRS+=	SAMEDIRS
 .for f t in ${SAME}
-SAMEDIRS+=	${LOCALEDIR}/$t
+DIRS+=		LOCALEDIR_$t
+LOCALEDIR_$t=	${LOCALEDIR}/$t
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/share/msgdef_unicode/Makefile b/share/msgdef_unicode/Makefile
index c0bffc05ccc6..34f8b30ff733 100644
--- a/share/msgdef_unicode/Makefile
+++ b/share/msgdef_unicode/Makefile
@@ -96,9 +96,9 @@ SAME+=		zh_TW.UTF-8 zh_HK.UTF-8
 FILES=		${LOCALES:S/$/.out/}
 CLEANFILES=	${FILES}
 
-DIRS+=		SAMEDIRS
 .for f t in ${SAME}
-SAMEDIRS+=	${LOCALEDIR}/$t
+DIRS+=		LOCALEDIR_$t
+LOCALEDIR_$t=	${LOCALEDIR}/$t
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile
index f1047e9cb5d3..da04535aa4c9 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -125,9 +125,9 @@ SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 FILES=		${LOCALES:S/$/.out/}
 CLEANFILES=	${FILES}
 
-DIRS+=	SAMEDIRS
 .for f t in ${SAME}
-SAMEDIRS+=	${LOCALEDIR}/$t
+DIRS+=		LOCALEDIR_$t
+LOCALEDIR_$t=	${LOCALEDIR}/$t
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/share/numericdef_unicode/Makefile b/share/numericdef_unicode/Makefile
index 3f7f3e4f285e..07290250c6b5 100644
--- a/share/numericdef_unicode/Makefile
+++ b/share/numericdef_unicode/Makefile
@@ -96,9 +96,9 @@ SAME+=		fr_FR.UTF-8 fr_BE.UTF-8
 FILES=		${LOCALES:S/$/.out/}
 CLEANFILES=	${FILES}
 
-DIRS+=		SAMEDIRS
 .for f t in ${SAME}
-SAMEDIRS+=	${LOCALEDIR}/$t
+DIRS+=		LOCALEDIR_$t
+LOCALEDIR_$t=	${LOCALEDIR}/$t
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index 428e8067ae18..df16c038ba4c 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -208,9 +208,9 @@ SAME+=		ko_KR.eucKR ko_KR.CP949	# legacy (same charset)
 FILES=		${LOCALES:S/$/.out/}
 CLEANFILES=	${FILES}
 
-DIRS+=	SAMEDIRS
 .for f t in ${SAME}
-SAMEDIRS+=	${LOCALEDIR}/$t
+DIRS+=		LOCALEDIR_$t
+LOCALEDIR_$t=	${LOCALEDIR}/$t
 SYMLINKS+=	../$f/${FILESNAME} \
     ${LOCALEDIR}/$t/${FILESNAME}
 .endfor
diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl
index 277102d60a49..78b2634b6250 100755
--- a/tools/tools/locale/tools/cldr2def.pl
+++ b/tools/tools/locale/tools/cldr2def.pl
@@ -1081,9 +1081,9 @@ EOF
 FILES=		\${LOCALES:S/\$/.${SRCOUT2}/}
 CLEANFILES=	\${FILES}
 
-DIRS+=		SAMEDIRS
 .for f t in \${SAME}
-SAMEDIRS+=	\${LOCALEDIR}/\$t
+DIRS+=		LOCALEDIR_\$t
+LOCALEDIR_\$t=	\${LOCALEDIR}/\$t
 SYMLINKS+=	../\$f/\${FILESNAME} \\
     \${LOCALEDIR}/\$t/\${FILESNAME}
 .endfor