From: bdrewery <bdrewery@FreeBSD.org>
Date: Wed, 11 Nov 2015 18:45:48 +0000 (+0000)
Subject: Use explicit filename when creating locale symlinks to avoid creating a
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bf614d3ddbed494cc2d3f8d4d486ad350b27cbb4;p=people%2Fliuw%2Ffreebsd.git

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
---

diff --git a/share/colldef/Makefile b/share/colldef/Makefile
index b6869e1e375..308163df1d4 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 fcefcca6b4c..21d3820d345 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 c15e245a887..5e758e61d1e 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 6dcb747954d..136ad8c7354 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 ed32a68ab3d..02e81d09189 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 a5f97f81edf..c078dc8a7ce 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 4d59fadb071..8aa79a61264 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}