From dfa1982352ee312079b42ea49adcbc1da15722f7 Mon Sep 17 00:00:00 2001 From: Jessica Clarke Date: Thu, 8 Jun 2023 17:00:50 +0100 Subject: [PATCH] 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 4e28739268e..528e348d613 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 | \