X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttng-ust%2Flttng-ust-master.sh;h=be2f31e7da51da382098e1bd154f0d5ccbd3c621;hb=371b695fa77dc68877d4d1384acbcbef9949ec8a;hp=cc441678bf9f9cd7247b918f59dab44a3f157c66;hpb=e9d51536e1559b3adbcfcc0f0f9b163b13964ddf;p=lttng-ci.git

diff --git a/lttng-ust/lttng-ust-master.sh b/lttng-ust/lttng-ust-master.sh
index cc44167..be2f31e 100755
--- a/lttng-ust/lttng-ust-master.sh
+++ b/lttng-ust/lttng-ust-master.sh
@@ -42,17 +42,21 @@ esac
 # dist: build via make dist
 # *   : normal tree build
 #
-# Make sure to move to the build_path before continuing
+# Make sure to move to the build_path and configure
+# before continuing
 
 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
@@ -64,13 +68,16 @@ case "$build" in
 
 		# 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
 
-$BUILD_PATH/configure --prefix=$PREFIX $CONF_OPTS
 make V=1
 make install
 
@@ -94,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