Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Sep 2016 05:22:08 +0000 (UTC)
From:      Li-Wen Hsu <lwhsu@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r305759 - stable/10
Message-ID:  <201609130522.u8D5M8Md095170@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609130522.u8D5M8Md095170>