From owner-p4-projects@FreeBSD.ORG Thu Aug 6 23:55:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85D771065673; Thu, 6 Aug 2009 23:55:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2D31C106564A for ; Thu, 6 Aug 2009 23:55:11 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1D85C8FC16 for ; Thu, 6 Aug 2009 23:55:11 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n76NtBmc020210 for ; Thu, 6 Aug 2009 23:55:11 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n76NtA3R020208 for perforce@freebsd.org; Thu, 6 Aug 2009 23:55:10 GMT (envelope-from delphij@freebsd.org) Date: Thu, 6 Aug 2009 23:55:10 GMT Message-Id: <200908062355.n76NtA3R020208@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 167078 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Aug 2009 23:55:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=167078 Change 167078 by delphij@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