From 24be5ce58871d3cd26ddfb21f92ff46adc0b1f1f Mon Sep 17 00:00:00 2001
From: Albert Hopkins <marduk@python.net>
Date: Mon, 14 Sep 2015 10:00:37 +0000
Subject: [PATCH] Allow images/packages to build in a different directory

By setting the VABUILDER_OUTPUT Makefile variable, one can have images
and packages saved to and retrieved from that directory instead of the
default (CURDIR).  This can be use to, e.g., have different profile's
builds in different directories (instead of having to give images
different filenames, etc.).
---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3fb8c80..1d50f6c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
 APPLIANCE ?= base
 CHROOT = $(CURDIR)/build
-PKGDIR = $(CURDIR)/packages
+VABUILDER_OUTPUT := $(CURDIR)
+PKGDIR = $(VABUILDER_OUTPUT)/packages
 DISTDIR = $(CURDIR)/distfiles
 PORTAGE_DIR = $(CURDIR)/portage
 HOSTNAME = $(APPLIANCE)
-IMAGES = $(CURDIR)/images
+IMAGES = $(VABUILDER_OUTPUT)/images
 RAW_IMAGE = $(IMAGES)/$(APPLIANCE).img
 QCOW_IMAGE = $(IMAGES)/$(APPLIANCE).qcow
 VMDK_IMAGE = $(IMAGES)/$(APPLIANCE).vmdk
@@ -18,7 +19,7 @@ KERNEL = $(CHROOT)/tmp/kernel
 GRUB = $(CHROOT)/tmp/grub
 PREPROOT = $(CHROOT)/tmp/preproot
 SYSTOOLS = $(CHROOT)/tmp/systools
-STAGE4_TARBALL = $(CURDIR)/images/$(APPLIANCE).tar.xz
+STAGE4_TARBALL = $(VABUILDER_OUTPUT)/images/$(APPLIANCE).tar.xz
 VIRTIO = NO
 TIMEZONE = UTC
 DISK_SIZE = 6.0G