git: 4b8b4c7dbf0f - main - release: Check for empty NODISTSETS

The branch main has been updated by cperciva:

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

commit 4b8b4c7dbf0fd4f946195dd7e8e4ddf10505beea
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2025-10-03 23:55:44 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-10-03 23:55:44 +0000

    release: Check for empty NODISTSETS
    
    Treat an empty NODISTSETS the same as if it is not defined; this avoids
    problems if a script calls 'make release NODISTSETS=${NODISTSETS}'.
    
    MFC after:      3 days
    Sponsored by:   https://www.patreon.com/cperciva
---
 release/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index 76a99ffdf3f3..8616d3817dd9 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -196,7 +196,7 @@ packagesystem: ${DISTRIBUTIONS}
 	sh ${.CURDIR}/scripts/make-manifest.sh $$(ls *.txz | grep -v container) > MANIFEST
 	touch ${.TARGET}
 
-.if !defined(NODISTSETS)
+.if !defined(NODISTSETS) || empty(NODISTSETS)
 disc1: packagesystem
 bootonly: packagesystem
 dvd: packagesystem
@@ -242,7 +242,7 @@ disc1:
 	    mtree -C -k type,mode,link,size | \
 	    sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG
 .endif
-.if !defined(NODISTSETS)
+.if !defined(NODISTSETS) || empty(NODISTSETS)
 	# Copy MANIFEST to provide legacy dist checksums in both modes
 	mkdir -p ${.TARGET}/usr/freebsd-dist
 	echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG
@@ -295,7 +295,7 @@ bootonly:
 	    MK_TOOLCHAIN=no \
 	    MK_RESCUE=no MK_DICT=no \
 	    MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no)
-.if !defined(NODISTSETS)
+.if !defined(NODISTSETS) || empty(NODISTSETS)
 # Copy manifest only (no distfiles) to get checksums
 	mkdir -p ${.TARGET}/usr/freebsd-dist
 	cp MANIFEST ${.TARGET}/usr/freebsd-dist
@@ -347,7 +347,7 @@ dvd:
 	    mtree -C -k type,mode,link,size | \
 	    sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG
 .endif
-.if !defined(NODISTSETS)
+.if !defined(NODISTSETS) || empty(NODISTSETS)
 	# Copy MANIFEST to provide legacy dist checksums in both modes
 	mkdir -p ${.TARGET}/usr/freebsd-dist
 	echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG