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
This commit is contained in:
bdrewery 2015-11-11 18:45:48 +00:00
parent 443f36fac2
commit bf614d3ddb
7 changed files with 14 additions and 7 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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