From owner-svn-src-stable@freebsd.org  Thu Jun 21 15:11:15 2018
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id E83731021A38;
 Thu, 21 Jun 2018 15:11:14 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 9D24E80BB3;
 Thu, 21 Jun 2018 15:11:14 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7F1AD135A2;
 Thu, 21 Jun 2018 15:11:14 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5LFBEcM064795;
 Thu, 21 Jun 2018 15:11:14 GMT (envelope-from dteske@FreeBSD.org)
Received: (from dteske@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5LFBEoa064794;
 Thu, 21 Jun 2018 15:11:14 GMT (envelope-from dteske@FreeBSD.org)
Message-Id: <201806211511.w5LFBEoa064794@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dteske set sender to
 dteske@FreeBSD.org using -f
From: Devin Teske <dteske@FreeBSD.org>
Date: Thu, 21 Jun 2018 15:11:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r335488 - stable/11/usr.sbin/bsdconfig
X-SVN-Group: stable-11
X-SVN-Commit-Author: dteske
X-SVN-Commit-Paths: stable/11/usr.sbin/bsdconfig
X-SVN-Commit-Revision: 335488
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Jun 2018 15:11:15 -0000

Author: dteske
Date: Thu Jun 21 15:11:14 2018
New Revision: 335488
URL: https://svnweb.freebsd.org/changeset/base/335488

Log:
  MFC r335306: bsdconfig: Make examples optional
  
  PR:		bin/228485
  Submitted by:	Dmitry Wagin <dmitry.wagin@ya.ru>
  Reported by:	Dmitry Wagin <dmitry.wagin@ya.ru>
  Sponsored by:	Smule, Inc.

Modified:
  stable/11/usr.sbin/bsdconfig/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.sbin/bsdconfig/Makefile
==============================================================================
--- stable/11/usr.sbin/bsdconfig/Makefile	Thu Jun 21 15:02:17 2018	(r335487)
+++ stable/11/usr.sbin/bsdconfig/Makefile	Thu Jun 21 15:11:14 2018	(r335488)
@@ -1,10 +1,11 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 SUBDIR=	console \
 	diskmgmt \
 	docsinstall \
 	dot \
-	examples \
 	include \
 	includes \
 	mouse \
@@ -17,6 +18,10 @@ SUBDIR=	console \
 	timezone \
 	ttys \
 	usermgmt
+
+.if ${MK_EXAMPLES} != "no"
+SUBDIR+= examples
+.endif
 
 FILESDIR=	${LIBEXECDIR}/bsdconfig
 FILES=		USAGE