From owner-svn-src-projects@FreeBSD.ORG  Fri Jan 18 23:24:00 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id EA24D31C;
 Fri, 18 Jan 2013 23:24:00 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DD988D92;
 Fri, 18 Jan 2013 23:24:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0INO0Pt084802;
 Fri, 18 Jan 2013 23:24:00 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0INO0IP084791;
 Fri, 18 Jan 2013 23:24:00 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201301182324.r0INO0IP084791@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 18 Jan 2013 23:24:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245632 - projects/mtree
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 18 Jan 2013 23:24:01 -0000

Author: brooks
Date: Fri Jan 18 23:24:00 2013
New Revision: 245632
URL: http://svnweb.freebsd.org/changeset/base/245632

Log:
  Don't pass DISTBASE through to etc/Makefile:distrib-dirs.  We don't use
  this target to invoke it any more.

Modified:
  projects/mtree/Makefile.inc1

Modified: projects/mtree/Makefile.inc1
==============================================================================
--- projects/mtree/Makefile.inc1	Fri Jan 18 23:23:58 2013	(r245631)
+++ projects/mtree/Makefile.inc1	Fri Jan 18 23:24:00 2013	(r245632)
@@ -810,8 +810,7 @@ redistribute:
 
 distrib-dirs distribution:
 	cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
-	    ${IMAKE_INSTALL} ${IMAKE_MTREE} DISTBASE=${DISTBASE} \
-	    METALOG=${METALOG} ${.TARGET}
+	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
 
 #
 # buildkernel and installkernel
@@ -1117,7 +1116,7 @@ _lex=		usr.bin/lex
 _yacc=		usr.bin/yacc
 .endif
 
-.if ${BOOTSTRAPPING} < 1000026
+.if defined(DB_FROM_SRC) && ${BOOTSTRAPPING} < 1000026
 _nmtree=	lib/libnetbsd \
 		usr.sbin/nmtree
 .endif