From dad5c80c83a6f01e3c0e5a22c65cad493917af9c Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Mon, 11 Sep 2006 13:15:09 +0000
Subject: Make it possible again to build -CURRENT snapshots on -STABLE.

Reported by:	Angelo Turetta
---
 release/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'release')

diff --git a/release/Makefile b/release/Makefile
index 8164472..9bdd49e 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -587,7 +587,7 @@ release.1:
 
 # Install the system into the various distributions.
 release.2:
-	cd ${.CURDIR}/../etc && make distrib-dirs DESTDIR=${RD}/trees/base
+	cd ${.CURDIR}/.. && ${CROSSMAKE} distrib-dirs DESTDIR=${RD}/trees/base
 	cd ${.CURDIR}/.. && ${CROSSMAKE} ${WORLD_FLAGS} distributeworld \
 	    DISTDIR=${RD}/trees
 	touch ${.TARGET}
@@ -611,7 +611,8 @@ release.4:
 .if exists(${.CURDIR}/${TARGET}/${j}_crunch.conf)
 	rm -rf ${j}_crunch
 	mkdir ${j}_crunch
-	cd ${j}_crunch; ${WMAKEENV} crunchgen -o \
+	cd ${j}_crunch; ${WMAKEENV} MAKEFLAGS="-m ${.CURDIR}/../share/mk" \
+	    crunchgen -o \
 	    ${.CURDIR}/${TARGET}/${j}_crunch.conf
 	cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk subclean
 	cd ${.CURDIR}/..; ${BINMAKE} -f Makefile.inc1 _build-tools
-- 
cgit v1.1