diff options
| author | gjb <gjb@FreeBSD.org> | 2016-03-22 21:02:04 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-03-22 21:02:04 +0000 |
| commit | 3669a0dced7e344be71d234ffc3a71530ef0ae08 (patch) | |
| tree | 96a067550efa206a69e2ed2d7cbb6cf2216123ff | |
| parent | 086e6f562ffbb6de24f1e51c7df40f403dd1522b (diff) | |
| download | FreeBSD-src-3669a0dced7e344be71d234ffc3a71530ef0ae08.zip FreeBSD-src-3669a0dced7e344be71d234ffc3a71530ef0ae08.tar.gz | |
Make WSTAGEDIR, KSTAGEDIR, and REPODIR configurable.
This should fix the 'packages' target when MAKEOBJDIRPREFIX or
DESTDIR is set in the make(1) environment or via command line.
Reported by: kmoore, sef, Marko Turk
Sponsored by: The FreeBSD Foundation
| -rw-r--r-- | Makefile.inc1 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index b5d028a8..890ee64 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1251,9 +1251,9 @@ stagekernel: ${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} distributekernel PORTSDIR?= /usr/ports -WSTAGEDIR= ${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/worldstage -KSTAGEDIR= ${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/kernelstage -REPODIR= ${MAKEOBJDIRPREFIX}${.CURDIR}/repo +WSTAGEDIR?= ${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/worldstage +KSTAGEDIR?= ${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/kernelstage +REPODIR?= ${MAKEOBJDIRPREFIX}${.CURDIR}/repo PKGSIGNKEY?= # empty _pkgbootstrap: |
