Merge branch 'master' into SDL

1 files changed, 12 insertions, 6 deletions

diff --git a/scripts/include/common.sh b/scripts/include/common.sh
index 9d253e6..974d66c 100644
--- a/scripts/include/common.sh
+++ b/scripts/include/common.sh
@@ -108,7 +108,8 @@ function run_autoreconf {
     if [[ "${flags}" == "" ]]; then
         flags="${AUTORECONF_FLAGS}"
     fi
-    cd "${srcdir}"
+    echo "cd ${srcdir}/${SUBDIR}"
+    cd "${srcdir}/${SUBDIR}"
     check_error $?
     echo "make distclean"
     make distclean
@@ -119,7 +120,8 @@ function run_autoreconf {
 }
 
 function run_src_script {
-    cd "${srcdir}"
+    echo "cd ${srcdir}/${SUBDIR}"
+    cd "${srcdir}/${SUBDIR}"
     check_error $?
     echo $@
     $@
@@ -130,6 +132,8 @@ function run_enable_same_dir_build {
     echo "copy sources from $srcdir to ${builddir}"
     cp -r "$srcdir" "${builddir}/.."
     export srcdir="$builddir"
+    echo mkdir -p "${builddir}/${SUBDIR}"
+    mkdir -p "${builddir}/${SUBDIR}" || true
     echo "change src dir to $srcdir"
 }
 
@@ -138,10 +142,11 @@ function run_configure {
     if [[ "${flags}" == "" ]]; then
         flags="${CONFIGURE_FLAGS}"
     fi
-    cd "${builddir}"
+    echo "cd ${builddir}/${SUBDIR}"
+    cd "${builddir}/${SUBDIR}"
     check_error $?
-    echo "configure --prefix=\"${bindir}\" ${flags}"
-    eval "$srcdir"/configure --prefix="${bindir}" ${flags}
+    echo "$srcdir"/"$SUBDIR"/configure --prefix="${bindir}" "${flags}"
+    eval "$srcdir"/"$SUBDIR"/configure --prefix="${bindir}" ${flags}
     check_error $?
     unset flags
 }
@@ -151,7 +156,8 @@ function run_cmake {
     if [[ "${flags}" == "" ]]; then
         flags="${CONFIGURE_FLAGS}"
     fi
-    cd "${builddir}"
+    echo "cd ${builddir}/${SUBDIR}"
+    cd "${builddir}/${SUBDIR}"
     check_error $?
     echo "cmake -DCMAKE_INSTALL_PREFIX:PATH=\"${bindir}\" \"$srcdir\" ${flags}"
     eval cmake -DCMAKE_INSTALL_PREFIX:PATH="${bindir}" "$srcdir" ${flags}