From 0244ffc613c03e9b0752b7808e19d92fea1be847 Mon Sep 17 00:00:00 2001 From: John Marino Date: Thu, 12 Nov 2015 09:19:31 +0100 Subject: [PATCH] cldr2def: Use explicit target files when generating symlinks Update the generated makefiles to use a target filename on symlinks. This avoids creating a directory symlink with the target directory does not exist. Taken from: FreeBSD --- share/colldef/Makefile | 3 ++- share/ctypedef/Makefile | 3 ++- share/monetdef/Makefile | 3 ++- share/msgdef/Makefile | 3 ++- share/numericdef/Makefile | 3 ++- share/timedef/Makefile | 3 ++- 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 72616aa735..b5173bd377 100644 --- a/share/colldef/Makefile +++ b/share/colldef/Makefile @@ -174,7 +174,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 c0f7fce01e..2a517fcd4e 100644 --- a/share/ctypedef/Makefile +++ b/share/ctypedef/Makefile @@ -175,7 +175,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 7ecfd9090e..f91543ebe6 100644 --- a/share/monetdef/Makefile +++ b/share/monetdef/Makefile @@ -172,7 +172,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 0aec316252..6755b9eedd 100644 --- a/share/msgdef/Makefile +++ b/share/msgdef/Makefile @@ -172,7 +172,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 501fd766ed..03bb20cb63 100644 --- a/share/numericdef/Makefile +++ b/share/numericdef/Makefile @@ -172,7 +172,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 3472cbb4f2..3890cf61c5 100644 --- a/share/timedef/Makefile +++ b/share/timedef/Makefile @@ -172,7 +172,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 2924dc39f5..0c3380e358 100644 --- a/tools/tools/locale/tools/cldr2def.pl +++ b/tools/tools/locale/tools/cldr2def.pl @@ -945,7 +945,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} -- 2.41.0