From 1c34bf95522f9245605fafcc9df3936f5211014e Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 8 Nov 2014 12:45:35 +0000
Subject: [PATCH] Fix DESTDIR for installworld, and make sure it is created
 before use.

Sponsored by:	The FreeBSD Foundation
---
 release/Makefile.vm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/release/Makefile.vm b/release/Makefile.vm
index 30f38682b46a..eb167defa5fc 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -44,9 +44,10 @@ vm-image:
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 . if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
 .  for FORMAT in ${VMFORMATS}
+	mkdir -p ${.OBJDIR}/${.TARGET}
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${.CURDIR}/${TARGET}/mk-vmimage.sh \
-		-C ${.CURDIR}/tools/vmimage.subr -d ${.TARGET} \
+		-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
 		-i ${VMBASE}.img -s ${VMSIZE} -f ${FORMAT} \
 		-S ${WORLDDIR} -o ${VMBASE}.${FORMAT}
 .  endfor
@@ -58,9 +59,10 @@ vm-cloudware:	${CLOUDTARGETS}
 
 vm-azure:
 .if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
+	mkdir -p ${.OBJDIR}/${.TARGET}
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${.CURDIR}/${TARGET}/mk-vmimage.sh \
-		-C ${.CURDIR}/tools/vmimage.subr -d ${.TARGET} \
+		-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
 		-i azure.img -s ${VMSIZE} -f ${AZURE_FORMAT} \
 		-S ${WORLDDIR} -o ${AZUREIMAGE} -c ${AZURECONF}
 .endif
@@ -68,9 +70,10 @@ vm-azure:
 
 vm-openstack:
 .if exists(${.CURDIR}/${TARGET}/mk-vmimage.sh)
+	mkdir -p ${.OBJDIR}/${.TARGET}
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${.CURDIR}/${TARGET}/mk-vmimage.sh \
-		-C ${.CURDIR}/tools/vmimage.subr -d ${.TARGET} \
+		-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
 		-i openstack.img -s ${VMSIZE} -f ${OPENSTACK_FORMAT} \
 		-S ${WORLDDIR} -o ${OPENSTACKIMAGE} -c ${OPENSTACKCONF}
 .endif