include ./config.mak
-BUILDDIRS = bin doc etc include info lib man sbin share vlc-lib tmp gecko-sdk
+BUILDDIRS = bin doc etc include info lib man sbin share tmp gecko-sdk
ifdef HAVE_DARWIN_OS
TARGETALL=using-bin
ifdef HAVE_DARWIN_OS
-CONTRIBREV=4
-contrib-macosx-$(ARCH)-$(CONTRIBREV)-$(DARWIN_COMPILER).tar.bz2:
+ifdef HAVE_DARWIN_OS_ON_INTEL
+CONTRIBREV=6
+else
+CONTRIBREV=5
+endif
+contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
$(WGET) ftp://ftp.videolan.org/pub/videolan/testing/contrib/$@
-using-bin: contrib-macosx-$(ARCH)-$(CONTRIBREV)-$(DARWIN_COMPILER).tar.bz2
+using-bin: contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
@if test -d tmp; then \
echo "Move away ./tmp, it's in the way" ; \
exit 1 ; \
exit 1 ; \
fi
mkdir tmp
- tar cf - bin sbin include lib vlc-lib share/aclocal* share/autoconf* \
+ tar cf - bin sbin include lib share/aclocal* share/autoconf* \
share/automake* share/gettext* share/libtool* gecko-sdk \
| (cd tmp; tar xf -)
./change_prefix.sh tmp $(PREFIX) @@CONTRIB_PREFIX@@