diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-11-11 18:45:48 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-11-11 18:45:48 +0000 |
| commit | bf614d3ddbed494cc2d3f8d4d486ad350b27cbb4 (patch) | |
| tree | a9be36eec8b5eeebd26272f34083d0d3c1c409b4 | |
| parent | 443f36fac2cf7129b311a7dbbc2db6fec455be57 (diff) | |
| download | FreeBSD-src-bf614d3ddbed494cc2d3f8d4d486ad350b27cbb4.zip FreeBSD-src-bf614d3ddbed494cc2d3f8d4d486ad350b27cbb4.tar.gz | |
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
| -rw-r--r-- | share/colldef/Makefile | 3 | ||||
| -rw-r--r-- | share/ctypedef/Makefile | 3 | ||||
| -rw-r--r-- | share/monetdef/Makefile | 3 | ||||
| -rw-r--r-- | share/msgdef/Makefile | 3 | ||||
| -rw-r--r-- | share/numericdef/Makefile | 3 | ||||
| -rw-r--r-- | share/timedef/Makefile | 3 | ||||
| -rwxr-xr-x | 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 b6869e1..308163d 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 fcefcca..21d3820 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 c15e245..5e758e6 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 6dcb747..136ad8c 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 ed32a68..02e81d0 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 a5f97f8..c078dc8 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 4d59fad..8aa79a6 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} |
