From owner-svn-src-projects@FreeBSD.ORG  Tue Feb 25 19:28:43 2014
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: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 A0D42AE9;
 Tue, 25 Feb 2014 19:28:43 +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 8CC121FA5;
 Tue, 25 Feb 2014 19:28:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1PJShsP074512;
 Tue, 25 Feb 2014 19:28:43 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1PJShfF074511;
 Tue, 25 Feb 2014 19:28:43 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201402251928.s1PJShfF074511@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 25 Feb 2014 19:28:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r262491 - projects/release-debugdist
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Tue, 25 Feb 2014 19:28:43 -0000

Author: gjb
Date: Tue Feb 25 19:28:43 2014
New Revision: 262491
URL: http://svnweb.freebsd.org/changeset/base/262491

Log:
  Add DEBUG_DISTRIBUTIONS, and set it to include base and
  EXTRA_DISTRIBUTIONS, excluding 'doc'. [1]
  
  Use DEBUG_DISTRIBUTIONS in the 'distributeworld installworld'
  and 'packageworld' targets, to reduce the number of occurances
  of excluding distributions that do not have .debug files.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-debugdist/Makefile.inc1

Modified: projects/release-debugdist/Makefile.inc1
==============================================================================
--- projects/release-debugdist/Makefile.inc1	Tue Feb 25 19:12:31 2014	(r262490)
+++ projects/release-debugdist/Makefile.inc1	Tue Feb 25 19:28:43 2014	(r262491)
@@ -789,6 +789,13 @@ EXTRA_DISTRIBUTIONS+=	games
 EXTRA_DISTRIBUTIONS+=	lib32
 .endif
 
+DEBUG_DISTRIBUTIONS=
+.if ${MK_DEBUG_FILES} != "no"
+. for dist in base ${EXTRA_DISTRIBUTIONS:S,doc,,}
+DEBUG_DISTRIBUTIONS+=	${dist}
+. endfor
+.endif
+
 MTREE_MAGIC?=	mtree 2.0
 
 distributeworld installworld: _installcheck_world
@@ -862,7 +869,7 @@ distributeworld installworld: _installch
 	${DESTDIR}/${DISTDIR}/${dist}.meta
 .endfor
 .if ${MK_DEBUG_FILES} != "no"
-. for dist in base ${EXTRA_DISTRIBUTIONS}
+. for dist in ${DEBUG_DISTRIBUTIONS}
 	@# For each file that exists in this dist, print the corresponding
 	@# line from the METALOG.  This relies on the fact that
 	@# a line containing only the filename will sort immediatly before
@@ -891,7 +898,7 @@ packageworld:
 .endfor
 
 .if ${MK_DEBUG_FILES} != "no"
-. for dist in base ${EXTRA_DISTRIBUTIONS}
+. for dist in ${DEBUG_DISTRIBUTIONS}
 .  if defined(NO_ROOT)
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \