X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=ac4934cc001aeaab02336bf9721b9d7d75816cc2;hb=0f5eea32151742591f03a6fb0c15219b4e675a53;hp=c32c18316b7896b95935f699529ea971b9f40d45;hpb=b451524fb92bdec19fb40b6db98484381e3717d2;p=vlc diff --git a/bootstrap b/bootstrap index c32c18316b..ac4934cc00 100755 --- a/bootstrap +++ b/bootstrap @@ -31,19 +31,19 @@ cd "$(dirname "$0")" 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