Author: lwhsu (ports committer)
Date: Wed Aug 17 17:54:24 2016
New Revision: 304296
URL: https://svnweb.freebsd.org/changeset/base/304296

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

Modified:
  stable/11/Makefile.inc1
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/Makefile.inc1
==============================================================================
--- stable/11/Makefile.inc1     Wed Aug 17 16:56:20 2016        (r304295)
+++ stable/11/Makefile.inc1     Wed Aug 17 17:54:24 2016        (r304296)
@@ -1011,7 +1011,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}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to