diff options
| author | gjb <gjb@FreeBSD.org> | 2017-07-07 15:00:25 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2017-07-07 15:00:25 +0000 |
| commit | cb3d8d8d6f845a554cc5087a8682700db4f8a936 (patch) | |
| tree | 2fffe3bee52e8cd7ffc52a7b4bc6d4cddd700678 | |
| parent | 68b89c96a435a2d436fda459b2c9a4e6571c9929 (diff) | |
| download | FreeBSD-src-cb3d8d8d6f845a554cc5087a8682700db4f8a936.zip FreeBSD-src-cb3d8d8d6f845a554cc5087a8682700db4f8a936.tar.gz | |
MFS11 r320753:
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)
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/ |
