From 5384a68fd98b9d2c320112b1cc352611abe8a1df Mon Sep 17 00:00:00 2001
From: sbruno <sbruno@FreeBSD.org>
Date: Thu, 18 Aug 2011 16:54:04 +0000
Subject: Allow release generation from a WORLDDIR that is not /usr/src

PR:		misc/159666
Submitted by:	Test Rat <ttsestt@gmail.com>
Reviewed by:	Nathan Whitehorn <nwhitehorn@freebsd.org>
Approved by:	re (kib)
---
 release/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'release')

diff --git a/release/Makefile b/release/Makefile
index 0e07ed3..19987cf 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -66,7 +66,7 @@ base.txz:
 	-mkdir ${DISTDIR}
 	cd ${WORLDDIR} && ${IMAKE} distributeworld DISTDIR=${DISTDIR}
 # Set up mergemaster root database
-	sh ${.CURDIR}/scripts/mm-mtree.sh -F \
+	sh ${.CURDIR}/scripts/mm-mtree.sh -m ${WORLDDIR} -F \
 	    "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" -D "${DISTDIR}/base"
 # Package all components
 	cd ${WORLDDIR} && ${IMAKE} packageworld DISTDIR=${DISTDIR}
-- 
cgit v1.1