From owner-svn-src-projects@FreeBSD.ORG  Sat Sep  5 05:12:32 2009
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 C9BAE1065670;
	Sat,  5 Sep 2009 05:12:32 +0000 (UTC) (envelope-from jb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B89848FC08;
	Sat,  5 Sep 2009 05:12:32 +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 n855CWtE037789;
	Sat, 5 Sep 2009 05:12:32 GMT (envelope-from jb@svn.freebsd.org)
Received: (from jb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n855CWqS037787;
	Sat, 5 Sep 2009 05:12:32 GMT (envelope-from jb@svn.freebsd.org)
Message-Id: <200909050512.n855CWqS037787@svn.freebsd.org>
From: John Birrell <jb@FreeBSD.org>
Date: Sat, 5 Sep 2009 05:12:32 +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: r196850 - projects/jbuild/usr.bin/jdirdep
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: Sat, 05 Sep 2009 05:12:32 -0000

Author: jb
Date: Sat Sep  5 05:12:32 2009
New Revision: 196850
URL: http://svn.freebsd.org/changeset/base/196850

Log:
  Need to use the JBUILD environment variable in preference to
  expecting to use jbuild in the PATH.

Modified:
  projects/jbuild/usr.bin/jdirdep/jdirdep.c

Modified: projects/jbuild/usr.bin/jdirdep/jdirdep.c
==============================================================================
--- projects/jbuild/usr.bin/jdirdep/jdirdep.c	Sat Sep  5 01:55:46 2009	(r196849)
+++ projects/jbuild/usr.bin/jdirdep/jdirdep.c	Sat Sep  5 05:12:32 2009	(r196850)
@@ -1025,7 +1025,10 @@ do_dirdep(const char *srctop, const char
 			err(1, "Could not delete '%s/%s", curdir, MAKEFILED);
 
 #ifdef JDIRDEP
-		snprintf(cmd, sizeof(cmd), "jbuild gendirdep");
+		const char *p_jbuild;
+		if ((p_jbuild = getenv("JBUILD")) == NULL)
+			p_jbuild = "jbuild";
+		snprintf(cmd, sizeof(cmd), "%s gendirdep", p_jbuild);
 #else
 		snprintf(cmd, sizeof(cmd), "build gendirdep");
 #endif