From owner-p4-projects@FreeBSD.ORG  Mon Apr 10 23:40:09 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F02F116A402; Mon, 10 Apr 2006 23:40:08 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7D03216A400
	for <perforce@freebsd.org>; Mon, 10 Apr 2006 23:40:08 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2006143D45
	for <perforce@freebsd.org>; Mon, 10 Apr 2006 23:40:08 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3ANe7CI000927
	for <perforce@freebsd.org>; Mon, 10 Apr 2006 23:40:07 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3ANe7dl000918
	for perforce@freebsd.org; Mon, 10 Apr 2006 23:40:07 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 10 Apr 2006 23:40:07 GMT
Message-Id: <200604102340.k3ANe7dl000918@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94959 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Apr 2006 23:40:09 -0000

http://perforce.freebsd.org/chv.cgi?CH=94959

Change 94959 by jb@jb_freebsd2 on 2006/04/10 23:39:21

	Ensure that CDDL code is only built if NO_CDDL is not defined.

Affected files ...

.. //depot/projects/dtrace/src/cddl/Makefile#3 edit

Differences ...

==== //depot/projects/dtrace/src/cddl/Makefile#3 (text+ko) ====

@@ -1,5 +1,9 @@
 # $FreeBSD$
 
-SUBDIR= lib usr.bin usr.sbin
+SUBDIR=
+
+.if !defined(NO_CDDL)
+SUBDIR+=	lib usr.bin usr.sbin
+.endif
 
 .include <bsd.subdir.mk>