From owner-svn-src-head@FreeBSD.ORG  Wed Jan 29 05:00:04 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A3ABAE92;
 Wed, 29 Jan 2014 05:00:04 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 90EB91EA4;
 Wed, 29 Jan 2014 05:00:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0T504qi056866;
 Wed, 29 Jan 2014 05:00:04 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0T504hA056865;
 Wed, 29 Jan 2014 05:00:04 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201401290500.s0T504hA056865@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 29 Jan 2014 05:00:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261257 - head/usr.bin
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Jan 2014 05:00:04 -0000

Author: imp
Date: Wed Jan 29 05:00:04 2014
New Revision: 261257
URL: http://svnweb.freebsd.org/changeset/base/261257

Log:
  Don't build BSDL dtc if the GPL dtc is enabled.

Modified:
  head/usr.bin/Makefile

Modified: head/usr.bin/Makefile
==============================================================================
--- head/usr.bin/Makefile	Wed Jan 29 02:39:44 2014	(r261256)
+++ head/usr.bin/Makefile	Wed Jan 29 05:00:04 2014	(r261257)
@@ -37,7 +37,6 @@ SUBDIR=	alias \
 	ctlstat \
 	cut \
 	dirname \
-	dtc \
 	du \
 	ee \
 	elf2aout \
@@ -231,6 +230,10 @@ SUBDIR+=	calendar
 _clang=		clang
 .endif
 
+.if ${MK_GPL_DTC} != "yes"
+SUBDIR+=	dtc
+.endif
+
 .if ${MK_GROFF} != "no"
 SUBDIR+=	vgrind
 .endif