d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

locales: fix abuse of bsd.dirs.mk

Browse Source 
the way SAMEDIRS was defined was an abuse of bsd.dirs.mk resulting in
all the directory to be created in one single command, but DESTDIR is
only prepend once on the first element of the list

Switch to the properway to use bsd.dirs.mk
This commit is contained in:
Baptiste Daroussin 2021-08-03 18:00:45 +02:00
parent 8b3bd5a2b5
commit 30e1773fde
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
share/colldef/Makefile
View File

@ -133,9 +133,9 @@ SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset)
FILES= ${LOCALES:S/$/.LC_COLLATE/} FILES= ${LOCALES:S/$/.LC_COLLATE/}
CLEANFILES= ${FILES} CLEANFILES= ${FILES}
DIRS+= SAMEDIRS
.for f t in ${SAME} .for f t in ${SAME}
SAMEDIRS+= ${LOCALEDIR}/$t DIRS+= LOCALEDIR_$t
LOCALEDIR_$t= ${LOCALEDIR}/$t
SYMLINKS+= ../$f/${FILESNAME} \ SYMLINKS+= ../$f/${FILESNAME} \
${LOCALEDIR}/$t/${FILESNAME} ${LOCALEDIR}/$t/${FILESNAME}
.endfor .endfor

4
share/colldef_unicode/Makefile
View File

@ -104,9 +104,9 @@ SAME+= zh_TW.UTF-8 zh_HK.UTF-8
FILES= ${LOCALES:S/$/.LC_COLLATE/} FILES= ${LOCALES:S/$/.LC_COLLATE/}
CLEANFILES= ${FILES} CLEANFILES= ${FILES}
DIRS+= SAMEDIRS
.for f t in ${SAME} .for f t in ${SAME}
SAMEDIRS+= ${LOCALEDIR}/$t DIRS+= LOCALEDIR_$t
LOCALEDIR_$t= ${LOCALEDIR}/$t
SYMLINKS+= ../$f/${FILESNAME} \ SYMLINKS+= ../$f/${FILESNAME} \
${LOCALEDIR}/$t/${FILESNAME} ${LOCALEDIR}/$t/${FILESNAME}
.endfor .endfor

4
share/ctypedef/Makefile
View File

@ -215,9 +215,9 @@ SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset)
FILES= ${LOCALES:S/$/.LC_CTYPE/} FILES= ${LOCALES:S/$/.LC_CTYPE/}
CLEANFILES= ${FILES} CLEANFILES= ${FILES}
DIRS+= SAMEDIRS
.for f t in ${SAME} .for f t in ${SAME}
SAMEDIRS+= ${LOCALEDIR}/$t DIRS+= LOCALEDIR_$t
LOCALEDIR_$t= ${LOCALEDIR}/$t
SYMLINKS+= ../$f/${FILESNAME} \ SYMLINKS+= ../$f/${FILESNAME} \
${LOCALEDIR}/$t/${FILESNAME} ${LOCALEDIR}/$t/${FILESNAME}
.endfor .endfor

4
share/monetdef/Makefile
View File

@ -129,9 +129,9 @@ SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset)
FILES= ${LOCALES:S/$/.out/} FILES= ${LOCALES:S/$/.out/}
CLEANFILES= ${FILES} CLEANFILES= ${FILES}
DIRS+= SAMEDIRS
.for f t in ${SAME} .for f t in ${SAME}
SAMEDIRS+= ${LOCALEDIR}/$t DIRS+= LOCALEDIR_$t
LOCALEDIR_$t= ${LOCALEDIR}/$t
SYMLINKS+= ../$f/${FILESNAME} \ SYMLINKS+= ../$f/${FILESNAME} \
${LOCALEDIR}/$t/${FILESNAME} ${LOCALEDIR}/$t/${FILESNAME}
.endfor .endfor

4
share/monetdef_unicode/Makefile
View File

@ -96,9 +96,9 @@ SAME+= sr_RS.UTF-8@latin sr_RS.UTF-8
FILES= ${LOCALES:S/$/.out/} FILES= ${LOCALES:S/$/.out/}
CLEANFILES= ${FILES} CLEANFILES= ${FILES}
DIRS+= SAMEDIRS
.for f t in ${SAME} .for f t in ${SAME}
SAMEDIRS+= ${LOCALEDIR}/$t DIRS+= LOCALEDIR_$t
LOCALEDIR_$t= ${LOCALEDIR}/$t
SYMLINKS+= ../$f/${FILESNAME} \ SYMLINKS+= ../$f/${FILESNAME} \
${LOCALEDIR}/$t/${FILESNAME} ${LOCALEDIR}/$t/${FILESNAME}
.endfor .endfor

4
share/msgdef/Makefile
View File

@ -122,9 +122,9 @@ SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset)
FILES= ${LOCALES:S/$/.out/} FILES= ${LOCALES:S/$/.out/}
CLEANFILES= ${FILES} CLEANFILES= ${FILES}
DIRS+= SAMEDIRS
.for f t in ${SAME} .for f t in ${SAME}
SAMEDIRS+= ${LOCALEDIR}/$t DIRS+= LOCALEDIR_$t
LOCALEDIR_$t= ${LOCALEDIR}/$t
SYMLINKS+= ../$f/${FILESNAME} \ SYMLINKS+= ../$f/${FILESNAME} \
${LOCALEDIR}/$t/${FILESNAME} ${LOCALEDIR}/$t/${FILESNAME}
.endfor .endfor

4
share/msgdef_unicode/Makefile
View File

@ -96,9 +96,9 @@ SAME+= zh_TW.UTF-8 zh_HK.UTF-8
FILES= ${LOCALES:S/$/.out/} FILES= ${LOCALES:S/$/.out/}
CLEANFILES= ${FILES} CLEANFILES= ${FILES}
DIRS+= SAMEDIRS
.for f t in ${SAME} .for f t in ${SAME}
SAMEDIRS+= ${LOCALEDIR}/$t DIRS+= LOCALEDIR_$t
LOCALEDIR_$t= ${LOCALEDIR}/$t
SYMLINKS+= ../$f/${FILESNAME} \ SYMLINKS+= ../$f/${FILESNAME} \
${LOCALEDIR}/$t/${FILESNAME} ${LOCALEDIR}/$t/${FILESNAME}
.endfor .endfor

4
share/numericdef/Makefile
View File

@ -125,9 +125,9 @@ SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset)
FILES= ${LOCALES:S/$/.out/} FILES= ${LOCALES:S/$/.out/}
CLEANFILES= ${FILES} CLEANFILES= ${FILES}
DIRS+= SAMEDIRS
.for f t in ${SAME} .for f t in ${SAME}
SAMEDIRS+= ${LOCALEDIR}/$t DIRS+= LOCALEDIR_$t
LOCALEDIR_$t= ${LOCALEDIR}/$t
SYMLINKS+= ../$f/${FILESNAME} \ SYMLINKS+= ../$f/${FILESNAME} \
${LOCALEDIR}/$t/${FILESNAME} ${LOCALEDIR}/$t/${FILESNAME}
.endfor .endfor

4
share/numericdef_unicode/Makefile
View File

@ -96,9 +96,9 @@ SAME+= fr_FR.UTF-8 fr_BE.UTF-8
FILES= ${LOCALES:S/$/.out/} FILES= ${LOCALES:S/$/.out/}
CLEANFILES= ${FILES} CLEANFILES= ${FILES}
DIRS+= SAMEDIRS
.for f t in ${SAME} .for f t in ${SAME}
SAMEDIRS+= ${LOCALEDIR}/$t DIRS+= LOCALEDIR_$t
LOCALEDIR_$t= ${LOCALEDIR}/$t
SYMLINKS+= ../$f/${FILESNAME} \ SYMLINKS+= ../$f/${FILESNAME} \
${LOCALEDIR}/$t/${FILESNAME} ${LOCALEDIR}/$t/${FILESNAME}
.endfor .endfor

4
share/timedef/Makefile
View File

@ -208,9 +208,9 @@ SAME+= ko_KR.eucKR ko_KR.CP949 # legacy (same charset)
FILES= ${LOCALES:S/$/.out/} FILES= ${LOCALES:S/$/.out/}
CLEANFILES= ${FILES} CLEANFILES= ${FILES}
DIRS+= SAMEDIRS
.for f t in ${SAME} .for f t in ${SAME}
SAMEDIRS+= ${LOCALEDIR}/$t DIRS+= LOCALEDIR_$t
LOCALEDIR_$t= ${LOCALEDIR}/$t
SYMLINKS+= ../$f/${FILESNAME} \ SYMLINKS+= ../$f/${FILESNAME} \
${LOCALEDIR}/$t/${FILESNAME} ${LOCALEDIR}/$t/${FILESNAME}
.endfor .endfor

4
tools/tools/locale/tools/cldr2def.pl
View File

@ -1081,9 +1081,9 @@ EOF
FILES= \${LOCALES:S/\$/.${SRCOUT2}/} FILES= \${LOCALES:S/\$/.${SRCOUT2}/}
CLEANFILES= \${FILES} CLEANFILES= \${FILES}
DIRS+= SAMEDIRS
.for f t in \${SAME} .for f t in \${SAME}
SAMEDIRS+= \${LOCALEDIR}/\$t DIRS+= LOCALEDIR_\$t
LOCALEDIR_\$t= \${LOCALEDIR}/\$t
SYMLINKS+= ../\$f/\${FILESNAME} \\ SYMLINKS+= ../\$f/\${FILESNAME} \\
\${LOCALEDIR}/\$t/\${FILESNAME} \${LOCALEDIR}/\$t/\${FILESNAME}
.endfor .endfor