diff options
| author | ru <ru@FreeBSD.org> | 2003-07-23 14:40:51 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2003-07-23 14:40:51 +0000 |
| commit | 14b4207391a50f34e4f30f47b138e76370f9bfca (patch) | |
| tree | d09ba653e92bcff81f1b90a94d7408598fba3f3e /release/Makefile | |
| parent | f8b34e3f70219ed6642f2c3ed7430361969ccccf (diff) | |
| download | FreeBSD-src-14b4207391a50f34e4f30f47b138e76370f9bfca.zip FreeBSD-src-14b4207391a50f34e4f30f47b138e76370f9bfca.tar.gz | |
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.
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 6 |
1 files changed, 4 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 |
