From a7b789cb0a5766d79cdcf3a4cd4c2bf21ff9f60d Mon Sep 17 00:00:00 2001
From: David McMahon <djmm@google.com>
Date: Mon, 28 Mar 2016 16:34:07 -0700
Subject: [PATCH] Honor incoming OUT_DIR from the Makefile.

---
 build/common.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/common.sh b/build/common.sh
index 38096f5b26..79f0f42bbc 100755
--- a/build/common.sh
+++ b/build/common.sh
@@ -60,7 +60,8 @@ readonly KUBE_BUILD_IMAGE_CROSS_TAG="v1.4.2-1"
 # *_OUTPUT_BINPATH - location where final binaries are placed.  If the remote
 #                    is really remote, this is the stuff that has to be copied
 #                    back.
-readonly LOCAL_OUTPUT_ROOT="${KUBE_ROOT}/_output"
+# OUT_DIR can come in from the Makefile, so honor it.
+readonly LOCAL_OUTPUT_ROOT="${KUBE_ROOT}/${OUT_DIR:-_output}"
 readonly LOCAL_OUTPUT_SUBPATH="${LOCAL_OUTPUT_ROOT}/dockerized"
 readonly LOCAL_OUTPUT_BINPATH="${LOCAL_OUTPUT_SUBPATH}/bin"
 readonly LOCAL_OUTPUT_IMAGE_STAGING="${LOCAL_OUTPUT_ROOT}/images"