Author: bdrewery Date: Wed Nov 11 18:45:48 2015 New Revision: 290677 URL: https://svnweb.freebsd.org/changeset/base/290677
Log: 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 Modified: head/share/colldef/Makefile head/share/ctypedef/Makefile head/share/monetdef/Makefile head/share/msgdef/Makefile head/share/numericdef/Makefile head/share/timedef/Makefile head/tools/tools/locale/tools/cldr2def.pl Modified: head/share/colldef/Makefile ============================================================================== --- head/share/colldef/Makefile Wed Nov 11 16:24:52 2015 (r290676) +++ head/share/colldef/Makefile Wed Nov 11 18:45:48 2015 (r290677) @@ -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} Modified: head/share/ctypedef/Makefile ============================================================================== --- head/share/ctypedef/Makefile Wed Nov 11 16:24:52 2015 (r290676) +++ head/share/ctypedef/Makefile Wed Nov 11 18:45:48 2015 (r290677) @@ -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} Modified: head/share/monetdef/Makefile ============================================================================== --- head/share/monetdef/Makefile Wed Nov 11 16:24:52 2015 (r290676) +++ head/share/monetdef/Makefile Wed Nov 11 18:45:48 2015 (r290677) @@ -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} Modified: head/share/msgdef/Makefile ============================================================================== --- head/share/msgdef/Makefile Wed Nov 11 16:24:52 2015 (r290676) +++ head/share/msgdef/Makefile Wed Nov 11 18:45:48 2015 (r290677) @@ -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} Modified: head/share/numericdef/Makefile ============================================================================== --- head/share/numericdef/Makefile Wed Nov 11 16:24:52 2015 (r290676) +++ head/share/numericdef/Makefile Wed Nov 11 18:45:48 2015 (r290677) @@ -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} Modified: head/share/timedef/Makefile ============================================================================== --- head/share/timedef/Makefile Wed Nov 11 16:24:52 2015 (r290676) +++ head/share/timedef/Makefile Wed Nov 11 18:45:48 2015 (r290677) @@ -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} Modified: head/tools/tools/locale/tools/cldr2def.pl ============================================================================== --- head/tools/tools/locale/tools/cldr2def.pl Wed Nov 11 16:24:52 2015 (r290676) +++ head/tools/tools/locale/tools/cldr2def.pl Wed Nov 11 18:45:48 2015 (r290677) @@ -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} _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"