svn commit: r292466 - in head: share/ctypedef tools/tools/locale/tools

[Baptiste Daroussin]

Author: bapt
Date: Sat Dec 19 12:26:01 2015
New Revision: 292466
URL: https://svnweb.freebsd.org/changeset/base/292466

Log:
  Use :E instead of regex in ctypedef Makefiles

Modified:
  head/share/ctypedef/Makefile
  head/tools/tools/locale/tools/cldr2def.pl

Modified: head/share/ctypedef/Makefile
==============================================================================
--- head/share/ctypedef/Makefile	Sat Dec 19 09:18:01 2015	(r292465)
+++ head/share/ctypedef/Makefile	Sat Dec 19 12:26:01 2015	(r292466)
@@ -9,7 +9,7 @@ MAPLOC=		${.CURDIR}/../../tools/tools/lo
 
 .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

Modified: head/tools/tools/locale/tools/cldr2def.pl
==============================================================================
--- head/tools/tools/locale/tools/cldr2def.pl	Sat Dec 19 09:18:01 2015	(r292465)
+++ head/tools/tools/locale/tools/cldr2def.pl	Sat Dec 19 12:26:01 2015	(r292466)
@@ -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";