svn commit: r297197 - projects/release-pkg

[Glen Barber]

Author: gjb
Date: Tue Mar 22 21:02:04 2016
New Revision: 297197
URL: https://svnweb.freebsd.org/changeset/base/297197

Log:
  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

Modified:
  projects/release-pkg/Makefile.inc1

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Tue Mar 22 19:39:50 2016	(r297196)
+++ projects/release-pkg/Makefile.inc1	Tue Mar 22 21:02:04 2016	(r297197)
@@ -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: