PERFORCE change 167078 for review

[Xin LI]

http://perforce.freebsd.org/chv.cgi?CH=167078

Change 167078 by delphij at charlie on 2009/08/06 23:55:05

	Make this build when 'make obj' is executed before making.

Affected files ...

.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/CP/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/ISO646/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/KOI/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/Makefile.part#7 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/BIG5/Makefile#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/Makefile.inc#6 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/Makefile.part#7 edit
.. //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/UTF/Makefile#6 edit

Differences ...

==== //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/CP/Makefile#6 (text+ko) ====

@@ -14,7 +14,7 @@
 		printf '%-32s%-16s%s\n' UCS/CP$$i \
 		    mapper_std CP/UCS%CP$$f'.mps';\
 	    done;\
-	    cat mapper.dir.CP.src;\
+	    cat ${.CURDIR}/mapper.dir.CP.src;\
 	    echo;\
 	) > ${.TARGET}
 
@@ -25,7 +25,7 @@
 		printf "%-32s%-32s%d\n" CP$$i UCS 1;\
 		printf "%-32s%-32s%d\n" UCS CP$$i 1;\
 	    done;\
-	    cat charset.pivot.CP.src;\
+	    cat ${.CURDIR}/charset.pivot.CP.src;\
 	    echo;\
 	) > ${.TARGET}
 

==== //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/ISO646/Makefile#6 (text+ko) ====

@@ -7,7 +7,7 @@
 RTABLENAME=		${TABLENAME}
 MAPPER=			mapper_646
 
-FILES_646!=		ls . | grep '\.646$$'
+FILES_646!=		ls ${.CURDIR} | grep '\.646$$'
 FILES+=			${FILES_646}
 
 .include "../Makefile.part"

==== //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/KOI/Makefile#6 (text+ko) ====

@@ -1,7 +1,7 @@
 # $NetBSD: Makefile.inc,v 1.3 2008/10/25 22:35:36 apb Exp $
 
 CODE=			KOI
-PARTFILE=		KOI8.part
+PARTFILE=		${.CURDIR}/KOI8.part
 
 MAPS=			GOST19768-74%UCS.mps \
 			ISO-5427%UCS.mps \
@@ -28,7 +28,7 @@
 
 mapper.dir.KOI: KOI8.part mapper.dir.KOI.src
 	( \
-	    cat mapper.dir.KOI.src; \
+	    cat ${.CURDIR}/mapper.dir.KOI.src; \
 	    for i in ${PART}; do \
 		printf "%-31s %-31s %s\n" KOI$$i"EXT/UCS" \
 			mapper_std KOI/KOI$$i"%UCS.mps"; \
@@ -46,7 +46,7 @@
 
 charset.pivot.KOI: KOI8.part charset.pivot.KOI.src
 	( \
-	    cat charset.pivot.KOI.src; \
+	    cat ${.CURDIR}/charset.pivot.KOI.src; \
 	    for i in ${PART}; do \
 		printf "%-31s %-31s%d\n" KOI$$i UCS 1; \
 		printf "%-31s %-31s%d\n" UCS KOI$$i 1; \

==== //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/csmapper/Makefile.part#7 (text+ko) ====

@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.13 2007/03/13 16:34:37 tnozaki Exp $
 
 ESUBDIR?=	${CODE}
-PARTFILE?=	${CODE}.part
+PARTFILE?=	${.CURDIR}/${CODE}.part
 .if exists(${PARTFILE})
 PART!=		sed '/^\#/d;/^$$/d;' ${PARTFILE}
 .endif

==== //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/BIG5/Makefile#6 (text+ko) ====

@@ -9,7 +9,7 @@
 .for i in ${PART:S/:/@/}
 Big5_$i_variable!= sed \
 	'/^\#/d;/^ *$$/d;/^${i:S/@/:/}[ 	]/!d;s/^[^ 	]*[ 	]*//' \
-	Big5.variable
+	${.CURDIR}/Big5.variable
 .endfor
 .for i in ${PART}
 .if !exists(Big5-${i:S/:/@/}.src)
@@ -17,7 +17,7 @@
 Big5-${i:S/:/@/}.src: Big5.src Big5.variable
 	sed -e 's/encoding/Big5-$i/' \
 		-e 's/variable/${Big5_$i_variable}/' \
-		Big5.src > $@
+		${.CURDIR}/Big5.src > $@
 	@echo Big5-${i:S/:/@/}.src >>.tmpfiles
 .endif
 .endfor

==== //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/Makefile.inc#6 (text+ko) ====

@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.PATH:	${.CURDIR}
+
 ESDBDIR?=	/usr/share/i18n/esdb
 MKESDB?=	/usr/bin/mkesdb
 

==== //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/Makefile.part#7 (text+ko) ====

@@ -1,7 +1,7 @@
 # $NetBSD: Makefile.part,v 1.6 2008/10/25 22:35:36 apb Exp $
 
-PARTFILE?=		${CODE}.part
-ALIASFILE?=		${CODE}.alias
+PARTFILE?=		${.CURDIR}/${CODE}.part
+ALIASFILE?=		${.CURDIR}/${CODE}.alias
 .if !defined(NO_SEP)
 SEP?=			-
 .endif
@@ -67,7 +67,7 @@
 .for i in ${PART}
 .if !exists(${EPREFIX}${i:S/:/@/}.src)
 ${EPREFIX}${i:S/:/@/}.src: ${CODE}.src
-	sed ${SED_EXP:S@%%PART%%@${i}@} ${CODE}.src > ${EPREFIX}${i:S/:/@/}.src
+	sed ${SED_EXP:S@%%PART%%@${i}@} ${.CURDIR}/${CODE}.src > ${EPREFIX}${i:S/:/@/}.src
 	@echo ${EPREFIX}${i:S/:/@/}.src >>.tmpfiles
 .endif
 .endfor

==== //depot/projects/soc2009/gabor_iconv/extracted/share/i18n/esdb/UTF/Makefile#6 (text+ko) ====

@@ -35,6 +35,6 @@
 	sed	-e 's/UTF-x/UTF-${i}/' \
 		-e 's/UTF-mod/${UTF-${i}-mod}/' \
 		-e 's/UTF-var/${UTF-${i}-var}/' \
-		${CODE}.src > ${EPREFIX}${i:S/:/@/}.src
+		${.CURDIR}/${CODE}.src > ${EPREFIX}${i:S/:/@/}.src
 	@echo ${EPREFIX}${i:S/:/@/}.src >>.tmpfiles
 .endfor