From db6ef590d5ee30c27a7c12f1c7072927feda1f7e Mon Sep 17 00:00:00 2001
From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Mon, 26 Jan 2015 13:58:45 -0500
Subject: [PATCH] lttng-ust: out-of-tree build

---
 lttng-ust/lttng-ust-master.sh | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/lttng-ust/lttng-ust-master.sh b/lttng-ust/lttng-ust-master.sh
index 3d52a49..6075d96 100755
--- a/lttng-ust/lttng-ust-master.sh
+++ b/lttng-ust/lttng-ust-master.sh
@@ -33,7 +33,24 @@ java-agent)
     ;;
 esac
 
-./configure --prefix=$PREFIX $CONF_OPTS
+BUILD_PATH=$WORKSPACE
+# Build type
+# oot : out-of-tree build
+# dist: build via make dist
+# *   : normal tree build
+case "$build" in
+	oot)
+		BUILD_PATH=$WORKSPACE/oot
+		mkdir -p $BUILD_PATH
+		cd $BUILD_PATH
+		;;
+	dist)
+		;;
+	*)
+		;;
+esac
+
+$WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
 make V=1
 make install
 
@@ -43,7 +60,7 @@ mkdir -p $WORKSPACE/tap/unit
 
 cd $WORKSPACE/tests
 
-prove --merge --exec '' - < $WORKSPACE/tests/unit_tests --archive $WORKSPACE/tap/unit/ || true
+prove --merge --exec '' - < $BUILD_PATH/tests/unit_tests --archive $WORKSPACE/tap/unit/ || true
 
 # TAP plugin is having a hard time with .yml files.
 rm -f $WORKSPACE/tap/unit/meta.yml
-- 
2.34.1