[vlc-commits] extras/mac: fix exported PATH for contrib compilation

[Felix Paul Kühne]

npapi-vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Jan 27 20:05:39 2014 +0100| [577312be17b757eddd0c4b4f3af162fe884156c2] | committer: Felix Paul Kühne

extras/mac: fix exported PATH for contrib compilation

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=577312be17b757eddd0c4b4f3af162fe884156c2
---

 extras/macosx/build-vlc.sh |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extras/macosx/build-vlc.sh b/extras/macosx/build-vlc.sh
index cae474d..b9cc64b 100755
--- a/extras/macosx/build-vlc.sh
+++ b/extras/macosx/build-vlc.sh
@@ -104,6 +104,8 @@ spopd #extras/macosx
 # Build time
 #
 
+export PATH="${npapi_root_dir}/extras/macosx/vlc/extras/tools/build/bin:${npapi_root_dir}/extras/macosx/contrib/${ARCH}-apple-darwin10/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin"
+
 info "Building tools"
 spushd extras/macosx/vlc/extras/tools
 if ! [ -e build ]; then
@@ -164,7 +166,6 @@ cd ${ARCH}-build
         --disable-macosx \
         --disable-notify \
         --disable-projectm \
-        --enable-merge-ffmpeg \
         --disable-growl \
         --disable-faad \
         --disable-bluray \