contribs: updated binary package for Mac OS X (i686 and x86_64 only for now)

[vlc] / extras / contrib / Makefile

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index 7c93d1087b9118ab2dd50cb6862dbee5f3e4af64..87403374d1918801391bbd197000a24af35f4c51 100644 (file)
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -25,9 +25,9 @@
 
 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_ON_INTEL
+ifdef HAVE_DARWIN_OS
 TARGETALL=using-bin
 else
 TARGETALL=using-src
@@ -43,7 +43,11 @@ src: using-src
 
 ifdef HAVE_DARWIN_OS
 
-CONTRIBREV=20080922
+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/$@
 
@@ -80,10 +84,11 @@ package-macosx:
                exit 1 ; \
        fi
        mkdir tmp
-       tar cf - bin sbin include lib vlc-lib share/aclocal* share/autoconf* \
-               share/automake* share/gettext* \
+       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@@
+       (cd tmp; tar cf - .) | bzip2 -c > contrib-macosx.tar.bz2
        rm -rf tmp
 
 DISTDIR = usr/win32