Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 22 Jun 2013 17:28:57 +0000 (UTC)
From:      Jilles Tjoelker <jilles@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r252098 - stable/9
Message-ID:  <201306221728.r5MHSvXD009957@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jilles
Date: Sat Jun 22 17:28:57 2013
New Revision: 252098
URL: http://svnweb.freebsd.org/changeset/base/252098

Log:
  MFC r251443: release: Allow empty extra distributions.
  
  For example, WITHOUT_SHAREDOCS= in src.conf creates an empty doc
  distribution.
  
  Submitted by:	Kurt Lidl
  Tested by:	Kurt Lidl

Modified:
  stable/9/Makefile.inc1   (contents, props changed)

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Sat Jun 22 16:10:57 2013	(r252097)
+++ stable/9/Makefile.inc1	Sat Jun 22 17:28:57 2013	(r252098)
@@ -754,7 +754,7 @@ distributeworld installworld: installche
 	    ${IMAKEENV} rm -rf ${INSTALLTMP}
 .if make(distributeworld)
 .for dist in ${EXTRA_DISTRIBUTIONS}
-	find ${DESTDIR}/${DISTDIR}/${dist} -empty -delete
+	find ${DESTDIR}/${DISTDIR}/${dist} -mindepth 1 -empty -delete
 .endfor
 .if defined(NO_ROOT)
 .for dist in base ${EXTRA_DISTRIBUTIONS}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306221728.r5MHSvXD009957>