From owner-svn-src-projects@FreeBSD.ORG  Fri Nov 12 22:10:20 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 14B441065670;
	Fri, 12 Nov 2010 22:10:20 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 02F898FC1C;
	Fri, 12 Nov 2010 22:10:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oACMAJu1025146;
	Fri, 12 Nov 2010 22:10:19 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oACMAJj7025144;
	Fri, 12 Nov 2010 22:10:19 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <201011122210.oACMAJj7025144@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Fri, 12 Nov 2010 22:10:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215208 - projects/jbuild/usr.bin/make
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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, 12 Nov 2010 22:10:20 -0000

Author: obrien
Date: Fri Nov 12 22:10:19 2010
New Revision: 215208
URL: http://svn.freebsd.org/changeset/base/215208

Log:
  * jbuild(1) does not rely on SQL libs.
  * #ifdef out the use of INCMK - which is irrelevant since the *.dirdep
    file was introduced.
  
  Obtained from: Juniper Networks

Modified:
  projects/jbuild/usr.bin/make/job.c

Modified: projects/jbuild/usr.bin/make/job.c
==============================================================================
--- projects/jbuild/usr.bin/make/job.c	Fri Nov 12 22:03:02 2010	(r215207)
+++ projects/jbuild/usr.bin/make/job.c	Fri Nov 12 22:10:19 2010	(r215208)
@@ -564,10 +564,14 @@ meta_exit(void)
 	 * If there is no include makefile list variable defined, then
 	 * we can't update dependencies.
 	 */
+#ifdef NEED_INCMK
+	    /* This is OBE by the .dirdep file. */
 	if ((p_incmk = Var_Value("INCMK", VAR_GLOBAL)) != NULL) {
 		/* Initialise the include makefile name list. */
 		jdirdep_incmk(Var_Value("INCMK", VAR_GLOBAL));
-
+#else
+	{
+#endif
 		p_machine = Var_Value("MACHINE", VAR_GLOBAL);
 		p_machine_arch = Var_Value("MACHINE_ARCH", VAR_GLOBAL);