X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttng-ust%2Flttng-ust-master.sh;h=e20fa0fe2d2a58f0c49b2151503fc84eb0e15ce6;hb=8a804acc7c9bfa48177a4a88d43d81cbf6ef0f18;hp=a1efae592c9215fec71d12804997d7e52db3705a;hpb=58d447bc4582a3a625598acdaaea92cc7d2891f9;p=lttng-ci.git

diff --git a/lttng-ust/lttng-ust-master.sh b/lttng-ust/lttng-ust-master.sh
index a1efae5..e20fa0f 100755
--- a/lttng-ust/lttng-ust-master.sh
+++ b/lttng-ust/lttng-ust-master.sh
@@ -48,13 +48,15 @@ esac
 BUILD_PATH=$WORKSPACE
 case "$build" in
 	oot)
+		echo "Out of tree build"
 		BUILD_PATH=$WORKSPACE/oot
 		mkdir -p $BUILD_PATH
 		cd $BUILD_PATH
 		$WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
 		;;
 	dist)
-		BUILD_PATH=/tmp/dist
+		echo "Distribution out of tree build"
+		BUILD_PATH=`mktemp -d`
 
 		# Initial configure and generate tarball
 		./configure
@@ -63,13 +65,15 @@ case "$build" in
 		mkdir -p $BUILD_PATH
 		cp *.tar.* $BUILD_PATH/
 		cd $BUILD_PATH
-		$BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
 
 		# Ignore level 1 of tar
 		tar xvf *.tar.* --strip 1
+
+		$BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
 		;;
 	*)
 		BUILD_PATH=$WORKSPACE
+		echo "Standard tree build"
 		$WORKSPACE/configure --prefix=$PREFIX $CONF_OPTS
 		;;
 esac
@@ -97,3 +101,7 @@ make clean
 # Cleanup rpath and libtool .la files
 find $WORKSPACE/build/lib -name "*.so" -exec chrpath --delete {} \;
 find $WORKSPACE/build/lib -name "*.la" -exec rm -f {} \;
+
+if [ $build = "dist" ]; then
+	rm -rf $BUILD_PATH
+fi