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

diff --git a/lttng-ust/lttng-ust-master.sh b/lttng-ust/lttng-ust-master.sh
index ce19657..be2f31e 100755
--- a/lttng-ust/lttng-ust-master.sh
+++ b/lttng-ust/lttng-ust-master.sh
@@ -37,24 +37,47 @@ python-agent)
     ;;
 esac
 
-BUILD_PATH=$WORKSPACE
 # Build type
 # oot : out-of-tree build
 # dist: build via make dist
 # *   : normal tree build
+#
+# 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)
+		echo "Distribution out of tree build"
+		BUILD_PATH=`mktemp -d`
+
+		# Initial configure and generate tarball
+		./configure
+		make dist
+
+		mkdir -p $BUILD_PATH
+		cp *.tar.* $BUILD_PATH/
+		cd $BUILD_PATH
+
+		# 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
 
-../configure --prefix=$PREFIX $CONF_OPTS
 make V=1
 make install
 
@@ -78,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