svn commit: r295953 - projects/release-pkg

[Glen Barber]

Author: gjb
Date: Wed Feb 24 02:59:14 2016
New Revision: 295953
URL: https://svnweb.freebsd.org/changeset/base/295953

Log:
  Further subdir-ize WSTAGEDIR and KSTAGEDIR base on the
  TARGET/TARGET_ARCH value, since there are valid use cases
  for having multiple on any given system.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-pkg/Makefile.inc1

Modified: projects/release-pkg/Makefile.inc1
==============================================================================
--- projects/release-pkg/Makefile.inc1	Wed Feb 24 02:52:49 2016	(r295952)
+++ projects/release-pkg/Makefile.inc1	Wed Feb 24 02:59:14 2016	(r295953)
@@ -1364,8 +1364,8 @@ packagekernel:
 stagekernel:
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} distributekernel
 
-WSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/worldstage
-KSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/kernelstage
+WSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/worldstage
+KSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/kernelstage
 REPODIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/repo
 PKGSIGNKEY?=	# empty