Added the WORLDDIR variable (defaulting to ${.CURDIR}/..) that

points to a directory where "make buildworld" was run.  Useful
for building 5.x snapshots on 4.x.

2 files changed, 11 insertions, 2 deletions

diff --git a/release/Makefile b/release/Makefile
index f02dc01..c8f6320 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -316,6 +316,8 @@ CVS_PORTSARGS=	-P
 CVS_PORTSARGS+=	-r ${PORTSRELEASETAG}
 .endif
 
+WORLDDIR?=	${.CURDIR}/..
+
 release rerelease:
 .if !defined(CHROOTDIR) || !defined(BUILDNAME) || !defined(CVSROOT)
 	@echo "To make a release you must set CHROOTDIR, BUILDNAME and CVSROOT" && false
@@ -337,9 +339,9 @@ release rerelease:
 .endif
 	mkdir -p ${CHROOTDIR}
 	@echo ">>> make release for ${TARGET} started on `LC_ALL=C TZ=GMT date`"
-	cd ${.CURDIR}/.. && ${NATIVEMAKE} -DNOGAMES -DNOHTML -DNOINFO -DNOMAN \
+	cd ${WORLDDIR} && ${NATIVEMAKE} -DNOGAMES -DNOHTML -DNOINFO -DNOMAN \
 	    -DNOPROFILE installworld DESTDIR=${CHROOTDIR}
-	cd ${.CURDIR}/../etc && ${NATIVEMAKE} distribution DESTDIR=${CHROOTDIR}
+	cd ${WORLDDIR}/etc && ${NATIVEMAKE} distribution DESTDIR=${CHROOTDIR}
 	if [ -f /etc/resolv.conf ]; then \
 		cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \
 	fi
diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index b175a21..366f291 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -206,6 +206,13 @@ This path name is in reference to the real system root,
 the root of the
 .Xr chroot 8
 directory tree.
+.It Va WORLDDIR
+The directory where
+.Dq Li "make buildworld"
+was run; defaults to
+.Pa ${.CURDIR}/..
+which usually points to
+.Pa /usr/src .
 .El
 .Pp
 Optional variables: