svn commit: r262491 - projects/release-debugdist

[Glen Barber]

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 \