From owner-p4-projects@FreeBSD.ORG  Thu Sep 27 22:01:16 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7303A16A420; Thu, 27 Sep 2007 22:01:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 315E116A419
	for <perforce@freebsd.org>; Thu, 27 Sep 2007 22:01:16 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0CB6513C458
	for <perforce@freebsd.org>; Thu, 27 Sep 2007 22:01:16 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8RM1FW5079723
	for <perforce@freebsd.org>; Thu, 27 Sep 2007 22:01:16 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8RM1FRl079720
	for perforce@freebsd.org; Thu, 27 Sep 2007 22:01:15 GMT
	(envelope-from jb@freebsd.org)
Date: Thu, 27 Sep 2007 22:01:15 GMT
Message-Id: <200709272201.l8RM1FRl079720@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 126887 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: Thu, 27 Sep 2007 22:01:16 -0000

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

Change 126887 by jb@jb_freebsd1 on 2007/09/27 22:00:26

	Tidy up a bit.

Affected files ...

.. //depot/projects/dtrace/src/Makefile.inc1#28 edit

Differences ...

==== //depot/projects/dtrace/src/Makefile.inc1#28 (text+ko) ====

@@ -38,16 +38,13 @@
 #
 SUBDIR=	share/info lib libexec
 SUBDIR+=bin
-.if ${MK_CDDL} != "no"
-SUBDIR+=cddl
-.else
-NO_CTF=1
-.endif
 .if ${MK_GAMES} != "no"
 SUBDIR+=games
 .endif
 .if ${MK_CDDL} != "no"
 SUBDIR+=cddl
+.else
+NO_CTF=1
 .endif
 SUBDIR+=gnu include
 .if ${MK_KERBEROS} != "no"
@@ -894,7 +891,8 @@
 .endif
 
 .if ${MK_CDDL} != "no"
-_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf gnu/lib/libdwarf lib/libelf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
+_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf gnu/lib/libdwarf \
+    lib/libelf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
 .endif
 
 bootstrap-tools: