release: Allow empty extra distributions

Operating Systems / FreeBSD - jilles [FreeBSD.org] - 5 June 2013 17:27 UTC

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

###

diff --git a/Makefile.inc1 b/Makefile.inc1
index 2574e4d..f09aa97 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -798,7 +798,7 @@ distributeworld installworld: installcheck installcheck_UGID
${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}

67e543e release: Allow empty extra distributions.
Makefile.inc1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Upstream: github.com

  • Share