X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=bootstrap;h=ac4934cc001aeaab02336bf9721b9d7d75816cc2;hb=722b9d0efed6161666b7a8993809e0c760be221b;hp=33778ab7acef48fd9010554a54e2784fd2620785;hpb=cdd2ad93fe897e9f1e4d311ddc77c67b03d62627;p=vlc

diff --git a/bootstrap b/bootstrap
index 33778ab7ac..ac4934cc00 100755
--- a/bootstrap
+++ b/bootstrap
@@ -22,6 +22,8 @@ export CYGWIN
 set -e
 set -x
 
+cd "$(dirname "$0")"
+
 ##
 ## Check for various tools
 ##
@@ -29,19 +31,19 @@ set -x
 ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
 
 # Check for contrib directory
-if test -d extras/contrib/bin; then
-  PATH="`pwd`/extras/contrib/bin:$PATH"
-  if test -d extras/contrib/share/aclocal; then
-    ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal"
+if test -d extras/contrib/build/bin; then
+  PATH="`pwd`/extras/contrib/build/bin:$PATH"
+  if test -d extras/contrib/build/share/aclocal; then
+    ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/build/share/aclocal"
   fi
   if test ".`uname -s`" = ".Darwin"; then
-    LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
-    DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH
+    LD_LIBRARY_PATH=./extras/contrib/build/lib:$LD_LIBRARY_PATH
+    DYLD_LIBRARY_PATH=./extras/contrib/build/lib:$DYLD_LIBRARY_PATH
     export LD_LIBRARY_PATH
     export DYLD_LIBRARY_PATH
   elif test ".`uname -s`" = ".BeOS"; then
-    LIBRARY_PATH=./extras/contrib/lib:$LIBRARY_PATH
-    BELIBRARIES=./extras/contrib/lib:$BELIBRARIES
+    LIBRARY_PATH=./extras/contrib/build/lib:$LIBRARY_PATH
+    BELIBRARIES=./extras/contrib/build/lib:$BELIBRARIES
     export LIBRARY_PATH
     export BELIBRARIES
   fi
@@ -112,9 +114,6 @@ rm -f po/Makevars.template ABOUT-NLS
 echo > ABOUT-NLS
 mv -f INSTALL.git INSTALL
 
-# Patch po/Makefile.in.in but it's not a drama if it fails
-patch -sfN -p1 < po/makefile-qt4.patch || true
-
 ##
 ##  files which need to be regenerated
 ##