Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 5 Jun 2013 22:27:49 +0000 (UTC)
From:      Jilles Tjoelker <jilles@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r251443 - head
Message-ID:  <201306052227.r55MRnmo070400@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jilles
Date: Wed Jun  5 22:27:49 2013
New Revision: 251443
URL: http://svnweb.freebsd.org/changeset/base/251443

Log:
  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
  Discussed with:	gjb
  MFC after:	1 week

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Jun  5 22:23:13 2013	(r251442)
+++ head/Makefile.inc1	Wed Jun  5 22:27:49 2013	(r251443)
@@ -798,7 +798,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?201306052227.r55MRnmo070400>