From 4149149e1e93d6c56a665257286eb99af4417f18 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Sat, 19 Dec 2015 12:26:01 +0000 Subject: [PATCH] Use :E instead of regex in ctypedef Makefiles --- share/ctypedef/Makefile | 2 +- tools/tools/locale/tools/cldr2def.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile index 99f7f48afd19..e7c4a8c79428 100644 --- a/share/ctypedef/Makefile +++ b/share/ctypedef/Makefile @@ -9,7 +9,7 @@ MAPLOC= ${.CURDIR}/../../tools/tools/locale/etc/final-maps .src.LC_CTYPE: 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 LOCALES+= be_BY.CP1131 diff --git a/tools/tools/locale/tools/cldr2def.pl b/tools/tools/locale/tools/cldr2def.pl index 70ef375004e5..0eea27fd336f 100755 --- a/tools/tools/locale/tools/cldr2def.pl +++ b/tools/tools/locale/tools/cldr2def.pl @@ -808,7 +808,7 @@ sub make_makefile { } elsif ($TYPE eq "ctypedef") { $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} " . " || true"; $SRCOUT2 = "LC_CTYPE";