svn commit: r303935 - head

[Li-Wen Hsu]

Author: lwhsu (ports committer)
Date: Wed Aug 10 18:22:42 2016
New Revision: 303935
URL: https://svnweb.freebsd.org/changeset/base/303935

Log:
  Only remove empty directories before packaging.
  
  This preserves files are intentionally empty, most of them are in tests.txz
  
  Reviewed by:	bdrewery
  MFC after:	3 days

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed Aug 10 18:19:17 2016	(r303934)
+++ head/Makefile.inc1	Wed Aug 10 18:22:42 2016	(r303935)
@@ -1013,7 +1013,7 @@ distributeworld installworld stageworld:
 	    ${IMAKEENV} rm -rf ${INSTALLTMP}
 .if make(distributeworld)
 .for dist in ${EXTRA_DISTRIBUTIONS}
-	find ${DESTDIR}/${DISTDIR}/${dist} -mindepth 1 -empty -delete
+	find ${DESTDIR}/${DISTDIR}/${dist} -mindepth 1 -type d -empty -delete
 .endfor
 .if defined(NO_ROOT)
 .for dist in base ${EXTRA_DISTRIBUTIONS}