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 b6869e1e3759a4c4867315475707c759f35df290..308163df1d4a5d51a04cf5ecd9e7f6f9b6cd39b9 100644 (file)
--- 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 fcefcca6b4c93a131f3ba28d881b90dc10bd767b..21d3820d345c201e2f6a93828bbc49b544f54173 100644 (file)
--- 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 c15e245a887e92e3f4ebf4e0197df0274951e8e3..5e758e61d1e045e486b8dd5f09c9c61a8dd78da5 100644 (file)
--- 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 6dcb747954d97d7dc03f8cfe01087713dbc527ee..136ad8c735420f369f243396ec067178275a1c6c 100644 (file)
--- 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 ed32a68ab3d2a7faa0dbd7be2a6764f1b8254257..02e81d09189c363901163dc5b28fe3806d21b428 100644 (file)
--- 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 a5f97f81edff2e8dd02b69323ee1c4fac18e0357..c078dc8a7ce9d9f55202841d52d6980a526591b7 100644 (file)
--- 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 4d59fadb0717efe7cda2bfa102e426c8ac5a0bba..8aa79a61264e20fe8c6ea1d60dbe66d0adaac760 100755 (executable)
--- 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}