From owner-svn-src-head@freebsd.org Tue Mar 1 22:25:50 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E09A1ABF926; Tue, 1 Mar 2016 22:25:50 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B3D151861; Tue, 1 Mar 2016 22:25:50 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u21MPnS6047422; Tue, 1 Mar 2016 22:25:49 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u21MPnH4047419; Tue, 1 Mar 2016 22:25:49 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201603012225.u21MPnH4047419@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Tue, 1 Mar 2016 22:25:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296281 - in head/share/i18n: csmapper esdb X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2016 22:25:51 -0000 Author: bdrewery Date: Tue Mar 1 22:25:49 2016 New Revision: 296281 URL: https://svnweb.freebsd.org/changeset/base/296281 Log: DIRDEPS_BUILD: Fix mapper files building during dirdeps. Sponsored by: EMC / Isilon Storage Division Modified: head/share/i18n/csmapper/Makefile head/share/i18n/csmapper/Makefile.part head/share/i18n/esdb/Makefile Modified: head/share/i18n/csmapper/Makefile ============================================================================== --- head/share/i18n/csmapper/Makefile Tue Mar 1 22:13:20 2016 (r296280) +++ head/share/i18n/csmapper/Makefile Tue Mar 1 22:25:49 2016 (r296281) @@ -31,7 +31,5 @@ charset.pivot.pvdb: charset.pivot FILES+= charset.pivot charset.pivot.pvdb CLEANFILES+= charset.pivot charset.pivot.pvdb -all: ${FILES} - .include "./Makefile.inc" .include Modified: head/share/i18n/csmapper/Makefile.part ============================================================================== --- head/share/i18n/csmapper/Makefile.part Tue Mar 1 22:13:20 2016 (r296280) +++ head/share/i18n/csmapper/Makefile.part Tue Mar 1 22:25:49 2016 (r296281) @@ -73,7 +73,9 @@ FILES+= ${MAPS} CLEANFILES+= ${MAPS} .endif -all: ${FILES} mapper.dir.${ESUBDIR} charset.pivot.${ESUBDIR} - .include "./Makefile.inc" .include + +.if !defined(_SKIP_BUILD) +all: mapper.dir.${ESUBDIR} charset.pivot.${ESUBDIR} +.endif Modified: head/share/i18n/esdb/Makefile ============================================================================== --- head/share/i18n/esdb/Makefile Tue Mar 1 22:13:20 2016 (r296280) +++ head/share/i18n/esdb/Makefile Tue Mar 1 22:25:49 2016 (r296281) @@ -28,7 +28,5 @@ esdb.alias: ${SUBDIR} esdb.alias.db: esdb.alias ${MKESDB} -m -o ${.TARGET} ${.ALLSRC} -all: ${FILES} - .include "./Makefile.inc" .include