svn commit: r305759 - stable/10

Li-Wen Hsu lwhsu at FreeBSD.org
Tue Sep 13 05:22:10 UTC 2016


Author: lwhsu (ports committer)
Date: Tue Sep 13 05:22:08 2016
New Revision: 305759
URL: https://svnweb.freebsd.org/changeset/base/305759

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

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

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Tue Sep 13 02:18:29 2016	(r305758)
+++ stable/10/Makefile.inc1	Tue Sep 13 05:22:08 2016	(r305759)
@@ -882,7 +882,7 @@ distributeworld installworld: _installch
 	    ${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}


More information about the svn-src-all mailing list