Fix: error in copy paste :(

[lttng-ci.git] / lttng-ust / lttng-ust-master.sh

diff --git a/lttng-ust/lttng-ust-master.sh b/lttng-ust/lttng-ust-master.sh
index cc441678bf9f9cd7247b918f59dab44a3f157c66..e20fa0fe2d2a58f0c49b2151503fc84eb0e15ce6 100755 (executable)
--- 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