diff options
| author | jkh <jkh@FreeBSD.org> | 1998-01-28 04:05:10 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1998-01-28 04:05:10 +0000 |
| commit | 7ce79be939037edae24cef97af10cce1c3320410 (patch) | |
| tree | 059f56cb918ddbcf781c0d73df7bb257c75b93de /release | |
| parent | 03884de9884fc515dddbc5439ab13e57d72857e2 (diff) | |
| download | FreeBSD-src-7ce79be939037edae24cef97af10cce1c3320410.zip FreeBSD-src-7ce79be939037edae24cef97af10cce1c3320410.tar.gz | |
Collapse 2 settings of PATH into one (didn't notice the 1st one before).
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/release/Makefile b/release/Makefile index 0c7d8af..cb572c1 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.337 1998/01/27 01:06:49 jkh Exp $ +# $Id: Makefile,v 1.338 1998/01/27 21:28:32 jkh Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ] # @@ -72,6 +72,9 @@ CD= /R/cdrom CD_DISC1= ${CD}/disc1 CD_DISC2= ${CD}/disc2 +# Where the bootstrap ports (see DOCPORTS) get installed. +LOCALDIR= /usr/local/bin + # ${BOOTSTRAPDIR} is for those utilities that refer to the hosting # environment, rather than the target environment. This is specifically # intended for kernel-dependent utilities that are used during the build. @@ -201,7 +204,7 @@ rerelease release: .endif # Don't remove this, or the build will fall over! echo "export RELEASEDIR=/R" >> ${CHROOTDIR}/mk - echo "export PATH=${BOOTSTRAPDIR}:$${PATH}" >> ${CHROOTDIR}/mk + echo "export PATH=${BOOTSTRAPDIR}:$${PATH}:${LOCALDIR}" >> ${CHROOTDIR}/mk echo "cd /usr/src" >> ${CHROOTDIR}/mk .if make(release) # This eases bootstrapping from a more recent hosting environment: @@ -532,8 +535,7 @@ cdrom.1: doc.1: for i in ${DOCPORTS}; do \ - cd /usr/ports/$$i && make all install clean \ - FORCE_PKG_REGISTER=yes PATH=$PATH:/usr/local/bin; \ + cd /usr/ports/$$i && make all install clean FORCE_PKG_REGISTER=yes; \ done cd /usr/doc && make all distribute DISTDIR=${RD}/trees |
