contrib: openjpeg: make sure we run only 1 job at once

[vlc] / contrib / bootstrap

diff --git a/contrib/bootstrap b/contrib/bootstrap
index 024ead91a22dcbca2dc67a66be84544e9c0b59ac..b24310f04194fdb33df6a2a8e87d2b97128162ac 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -38,7 +38,7 @@ PKGS_DISABLE=
 BUILD_ENCODERS="1"
 BUILD_DISCS="1"
 
-if test ! -f "../src/main.mak"
+if test ! -f "../../contrib/src/main.mak"
 then
        echo "$0 must be run from a subdirectory"
        exit 1
@@ -103,17 +103,11 @@ if test "$PREFIX"
 then
        # strip trailing slash
        PREFIX="${PREFIX%/}"
-else
-       PREFIX="../hosts/$HOST"
 fi
 
 #
 # Prepare files
 #
-echo "Creating prefix... $PREFIX"
-mkdir -p -- "$PREFIX" || exit $?
-mkdir -p -- "$PREFIX/share/aclocal" || exit $?
-
 echo "Creating configuration file... config.mak"
 exec 3>config.mak
 cat >&3 << EOF
@@ -121,7 +115,6 @@ cat >&3 << EOF
 # Any change will be overwritten if ../bootstrap is run again.
 BUILD := $BUILD
 HOST := $HOST
-PREFIX := $PREFIX
 PKGS_DISABLE := $PKGS_DISABLE
 PKGS_ENABLE := $PKGS_ENABLE
 EOF
@@ -144,6 +137,7 @@ add_make_enabled()
        done
 }
 
+test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
 test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
 test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
 
@@ -176,7 +170,7 @@ esac
 # Results output
 #
 test -e Makefile && unlink Makefile
-ln -sf ../src/main.mak Makefile
+ln -sf ../../contrib/src/main.mak Makefile
 cat << EOF
 Bootstrap completed.
 
@@ -194,3 +188,5 @@ Other targets:
  * make clean        clean everything
  * make list         list packages
 EOF
+
+mkdir -p ../../contrib/tarballs