svn commit: r251443 - head

Jilles Tjoelker jilles at FreeBSD.org
Wed Jun 5 22:27:49 UTC 2013


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}


More information about the svn-src-head mailing list