Date: Tue, 11 Apr 2006 10:12:13 GMT From: soc-andrew <soc-andrew@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 94982 for review Message-ID: <200604111012.k3BACDBf070328@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=94982 Change 94982 by soc-andrew@soc-andrew_serv on 2006/04/11 10:11:57 Fix to build -CURRENT on -STABLE Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#40 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#40 (text+ko) ==== @@ -600,7 +600,7 @@ # Install the system into the various distributions. release.2: - cd ${.CURDIR}/../etc && make distrib-dirs DESTDIR=${RD}/trees/base + cd ${.CURDIR}/.. && make distrib-dirs DESTDIR=${RD}/trees/base cd ${.CURDIR}/.. && ${CROSSMAKE} ${WORLD_FLAGS} distributeworld \ DISTDIR=${RD}/trees touch ${.TARGET} @@ -624,8 +624,8 @@ .if exists(${.CURDIR}/${TARGET}/${j}_crunch.conf) rm -rf ${j}_crunch mkdir ${j}_crunch - cd ${j}_crunch; ${WMAKEENV} crunchgen -o \ - ${.CURDIR}/${TARGET}/${j}_crunch.conf + 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 cd ${j}_crunch; CFLAGS="-Os -pipe" ${WMAKE} -f ${j}_crunch.mk \ @@ -1224,7 +1224,7 @@ > ${RD}/dists/${TD}/$$tn.mtree ; \ else \ true; \ - fi; \ + fi; \ ) .else @( cd ${SD} && \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604111012.k3BACDBf070328>