git: dfa1982352ee - main - etc: Don't create stray directories in NO_ROOT distrib-dirs

From: Jessica Clarke <jrtc27_at_FreeBSD.org>
Date: Thu, 08 Jun 2023 18:14:22 UTC
The branch main has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/commit/?id=dfa1982352ee312079b42ea49adcbc1da15722f7

commit dfa1982352ee312079b42ea49adcbc1da15722f7
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2023-06-08 16:00:50 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2023-06-08 18:14:12 +0000

    etc: Don't create stray directories in NO_ROOT distrib-dirs
    
    The loop above is responsible for creating the actual directories,
    whilst this one is just responsible for creating the corresponding
    METALOG. Since DESTDIR already includes DISTBASE, this results in
    creating a second set of roots (one per MTREES entry) within DISTBASE
    whenever DISTBASE is non-empty, such as base/base, base/base/var,
    base/base/usr, etc. in the distributeworld case. This is purely cosmetic
    though as they won't appear in the METALOG.
---
 etc/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/etc/Makefile b/etc/Makefile
index 4e28739268e6..528e348d6139 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -146,7 +146,6 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
 	d=${_d}; \
 	test "$$d" = "/" && d=""; \
 	d=${DISTBASE}$$d; \
-	test -d ${DESTDIR}/$$d || mkdir -p ${DESTDIR}/$$d; \
 	${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K all | " \
 	    "sed s#^\.#.$$d# | ${METALOG.add}" ; \
 	${MTREE_FILTER} $$m | \