Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Dec 2012 10:12:12 +0000 (UTC)
From:      Gabor Kovesdan <gabor@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r244348 - head/share/i18n/csmapper
Message-ID:  <201212171012.qBHACCdi064727@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gabor
Date: Mon Dec 17 10:12:12 2012
New Revision: 244348
URL: http://svnweb.freebsd.org/changeset/base/244348

Log:
  - Fix handling of .mps files
  
  PR:		bin/161454
  Submitted by:	Yamaya Takashi <yamayan@kbh.biglobe.ne.jp>

Modified:
  head/share/i18n/csmapper/Makefile.part

Modified: head/share/i18n/csmapper/Makefile.part
==============================================================================
--- head/share/i18n/csmapper/Makefile.part	Mon Dec 17 10:10:13 2012	(r244347)
+++ head/share/i18n/csmapper/Makefile.part	Mon Dec 17 10:12:12 2012	(r244348)
@@ -28,9 +28,9 @@ mapper.dir.${ESUBDIR}: ${CODE}.part
 	echo "# ${ESUBDIR}" > ${.TARGET}
 .for i in ${PART}
 	printf "%-32s%-32s%s\n" ${ENCID:S@%%PART%%@${i}@}/UCS ${MAPPER} \
-		${ESUBDIR}/${TABLENAME:S@%%PART%%@${i}@}${ENCEXT} >> ${.TARGET}
+		${ESUBDIR}/${TABLENAME:S@%%PART%%@${i}@:S/:/@/}${ENCEXT} >> ${.TARGET}
 	printf "%-32s%-32s%s\n" UCS/${ENCID:S@%%PART%%@${i}@} ${MAPPER} \
-		${REVSYMBOL}${ESUBDIR}/${RTABLENAME:S@%%PART%%@${i}@}${ENCEXT} >> ${.TARGET}
+		${REVSYMBOL}${ESUBDIR}/${RTABLENAME:S@%%PART%%@${i}@:S/:/@/}${ENCEXT} >> ${.TARGET}
 .endfor
 	echo >> ${.TARGET}
 .else
@@ -59,13 +59,13 @@ CLEANFILES+= charset.pivot.${ESUBDIR}
 
 .if !defined(MAPS)
 .for i in ${PART}
-.if exists(${TABLENAME:S@%%PART%%@${i}@}.src)
-FILES+=	${TABLENAME:S@%%PART%%@${i}@}.mps
-CLEANFILES+= ${TABLENAME:S@%%PART%%@${i}@}.mps
-.endif
-.if exists(${RTABLENAME:S@%%PART%%@${i}@}.src)
-FILES+=	${RTABLENAME:S@%%PART%%@${i}@}.mps
-CLEANFILES+= ${RTABLENAME:S@%%PART%%@${i}@}.mps
+.if exists(${TABLENAME:S@%%PART%%@${i}@:S/:/@/}.src)
+FILES+=	${TABLENAME:S@%%PART%%@${i}@:S/:/@/}.mps
+CLEANFILES+= ${TABLENAME:S@%%PART%%@${i}@:S/:/@/}.mps
+.endif
+.if exists(${RTABLENAME:S@%%PART%%@${i}@:S/:/@/}.src)
+FILES+=	${RTABLENAME:S@%%PART%%@${i}@:S/:/@/}.mps
+CLEANFILES+= ${RTABLENAME:S@%%PART%%@${i}@:S/:/@/}.mps
 .endif
 .endfor
 .else



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212171012.qBHACCdi064727>