Use :E instead of regex in ctypedef Makefiles

This commit is contained in:
Baptiste Daroussin 2015-12-19 12:26:01 +00:00
parent cf245b1092
commit 4149149e1e
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=292466
2 changed files with 2 additions and 2 deletions

View file

@ -9,7 +9,7 @@ MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps
.src.LC_CTYPE: .src.LC_CTYPE:
localedef -D -U -c -w ${MAPLOC}/widths.txt \ localedef -D -U -c -w ${MAPLOC}/widths.txt \
-f ${MAPLOC}/map.${.IMPSRC:T:R:C/^.*\.//} \ -f ${MAPLOC}/map.${.IMPSRC:T:R:E} \
-i ${.IMPSRC} ${.OBJDIR}/${.IMPSRC:T:R} || true -i ${.IMPSRC} ${.OBJDIR}/${.IMPSRC:T:R} || true
LOCALES+= be_BY.CP1131 LOCALES+= be_BY.CP1131

View file

@ -808,7 +808,7 @@ sub make_makefile {
} }
elsif ($TYPE eq "ctypedef") { elsif ($TYPE eq "ctypedef") {
$SRCOUT = "localedef -D -U -c -w \${MAPLOC}/widths.txt \\\n" . $SRCOUT = "localedef -D -U -c -w \${MAPLOC}/widths.txt \\\n" .
"\t-f \${MAPLOC}/map.\${.IMPSRC:T:R:C/^.*\\.//} " . "\t-f \${MAPLOC}/map.\${.IMPSRC:T:R:E} " .
"\\\n\t-i \${.IMPSRC} \${.OBJDIR}/\${.IMPSRC:T:R} " . "\\\n\t-i \${.IMPSRC} \${.OBJDIR}/\${.IMPSRC:T:R} " .
" || true"; " || true";
$SRCOUT2 = "LC_CTYPE"; $SRCOUT2 = "LC_CTYPE";