From d4ea5890a86a54c538c5d06649c7652884f1f642 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 11 Nov 2015 18:45:48 +0000
Subject: [PATCH] Use explicit filename when creating locale symlinks to avoid
 creating a directory symlink when the target directory does not exist.  This
 will cause an error instead of a broken setup.

Sponsored by:	EMC / Isilon Storage Division
---
 share/colldef/Makefile               | 3 ++-
 share/ctypedef/Makefile              | 3 ++-
 share/monetdef/Makefile              | 3 ++-
 share/msgdef/Makefile                | 3 ++-
 share/numericdef/Makefile            | 3 ++-
 share/timedef/Makefile               | 3 ++-
 tools/tools/locale/tools/cldr2def.pl | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index b6869e1e3759..308163df1d4a 100644
--- a/share/colldef/Makefile
+++ b/share/colldef/Makefile
@@ -175,7 +175,8 @@ FILES=		${LOCALES:S/$/.LC_COLLATE/}
 CLEANFILES=	${FILES}
 
 .for f in ${SAME}
-SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} ${LOCALEDIR}/${f:C/^.*://}
+SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} \
+    ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME}
 .endfor
 
 .for f in ${LOCALES}
diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile
index fcefcca6b4c9..21d3820d345c 100644
--- a/share/ctypedef/Makefile
+++ b/share/ctypedef/Makefile
@@ -176,7 +176,8 @@ FILES=		${LOCALES:S/$/.LC_CTYPE/}
 CLEANFILES=	${FILES}
 
 .for f in ${SAME}
-SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} ${LOCALEDIR}/${f:C/^.*://}
+SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} \
+    ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME}
 .endfor
 
 .for f in ${LOCALES}
diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile
index c15e245a887e..5e758e61d1e0 100644
--- a/share/monetdef/Makefile
+++ b/share/monetdef/Makefile
@@ -173,7 +173,8 @@ FILES=		${LOCALES:S/$/.out/}
 CLEANFILES=	${FILES}
 
 .for f in ${SAME}
-SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} ${LOCALEDIR}/${f:C/^.*://}
+SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} \
+    ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME}
 .endfor
 
 .for f in ${LOCALES}
diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile
index 6dcb747954d9..136ad8c73542 100644
--- a/share/msgdef/Makefile
+++ b/share/msgdef/Makefile
@@ -173,7 +173,8 @@ FILES=		${LOCALES:S/$/.out/}
 CLEANFILES=	${FILES}
 
 .for f in ${SAME}
-SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} ${LOCALEDIR}/${f:C/^.*://}
+SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} \
+    ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME}
 .endfor
 
 .for f in ${LOCALES}
diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile
index ed32a68ab3d2..02e81d09189c 100644
--- a/share/numericdef/Makefile
+++ b/share/numericdef/Makefile
@@ -173,7 +173,8 @@ FILES=		${LOCALES:S/$/.out/}
 CLEANFILES=	${FILES}
 
 .for f in ${SAME}
-SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} ${LOCALEDIR}/${f:C/^.*://}
+SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} \
+    ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME}
 .endfor
 
 .for f in ${LOCALES}
diff --git a/share/timedef/Makefile b/share/timedef/Makefile
index a5f97f81edff..c078dc8a7ce9 100644
--- a/share/timedef/Makefile
+++ b/share/timedef/Makefile
@@ -173,7 +173,8 @@ FILES=		${LOCALES:S/$/.out/}
 CLEANFILES=	${FILES}
 
 .for f in ${SAME}
-SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} ${LOCALEDIR}/${f:C/^.*://}
+SYMLINKS+=	../${f:C/:.*$//}/${FILESNAME} \
+    ${LOCALEDIR}/${f:C/^.*://}/${FILESNAME}
 .endfor
 
 .for f in ${LOCALES}
diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl
index 4d59fadb0717..8aa79a61264e 100755
--- a/tools/tools/locale/tools/cldr2def.pl
+++ b/tools/tools/locale/tools/cldr2def.pl
@@ -946,7 +946,8 @@ FILES=		\${LOCALES:S/\$/.${SRCOUT2}/}
 CLEANFILES=	\${FILES}
 
 .for f in \${SAME}
-SYMLINKS+=	../\${f:C/:.*\$//}/\${FILESNAME} \${LOCALEDIR}/\${f:C/^.*://}
+SYMLINKS+=	../\${f:C/:.*\$//}/\${FILESNAME} \\
+    \${LOCALEDIR}/\${f:C/^.*://}/\${FILESNAME}
 .endfor
 
 .for f in \${LOCALES}