diff options
author | gjb <gjb@FreeBSD.org> | 2017-07-06 18:46:33 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2017-07-06 18:46:33 +0000 |
commit | 5964b8d169737b73fccad1ce2fe8cf0279cf621d (patch) | |
tree | 981ba7f2b806051288b92374817a636d478d6853 | |
parent | 74db6cac33921b3f586f719d53802c706e1a9cbc (diff) | |
download | FreeBSD-src-5964b8d169737b73fccad1ce2fe8cf0279cf621d.zip FreeBSD-src-5964b8d169737b73fccad1ce2fe8cf0279cf621d.tar.gz |
MFC r320748:
Allow passing NOPKG= to make(1) to enable the pkg-stage target
from getting executed when NOPKG is defined but empty.
Approved by: re (kib, insta-MFC)
Sponsored by: The FreeBSD Foundation
-rw-r--r-- | release/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/Makefile b/release/Makefile index 6c2818a..12bd53f 100644 --- a/release/Makefile +++ b/release/Makefile @@ -265,7 +265,7 @@ packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES} touch ${.TARGET} pkg-stage: -.if !defined(NOPKG) +.if !defined(NOPKG) || empty(NOPKG) env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \ sh ${.CURDIR}/scripts/pkg-stage.sh mkdir -p ${.OBJDIR}/dvd/packages/repos/ |