contrib also needs share/libtool when using the binary package.

[vlc] / extras / contrib / Makefile

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index 4d7a2bcce23e38bebd710d2039f89e1cc5191962..3fed21832be3c41e694f6da707c51837844ac261 100644 (file)
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -27,14 +27,25 @@ include ./config.mak
 
 BUILDDIRS = bin doc etc include info lib man sbin share vlc-lib tmp gecko-sdk
 
-all:
+ifdef HAVE_DARWIN_OS_ON_INTEL
+TARGETALL=using-bin
+else
+TARGETALL=using-src
+endif
+
+all: $(TARGETALL)
+
+using-src:
        $(MAKE) -C src
 
+# shortcut
+src: using-src
+
 ifdef HAVE_DARWIN_OS
 
-CONTRIBREV=20080922
+CONTRIBREV=2
 contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
-       $(WGET) ftp://ftp.videolan.org/pub/videolan/testing/contrib/contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
+       $(WGET) ftp://ftp.videolan.org/pub/videolan/testing/contrib/$@
 
 using-bin: contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
        @if test -d tmp; then \
@@ -42,7 +53,7 @@ using-bin: contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2
                exit 1 ; \
        fi
        mkdir tmp
-       (cd tmp && tar jxvf ../contrib-macosx.tar.bz2)
+       (cd tmp && tar jxvf ../$<)
        ./change_prefix.sh tmp @@CONTRIB_PREFIX@@  $(PREFIX)
        for dir in `(cd tmp && find . -type d)`; do mkdir -p -- $$dir; done
        for i in `(cd tmp && find . -not -type d)`; do mv -f tmp/$$i $$i; done
@@ -70,9 +81,10 @@ package-macosx:
        fi
        mkdir tmp
        tar cf - bin sbin include lib vlc-lib share/aclocal* share/autoconf* \
-               share/automake* share/gettext* \
+               share/automake* share/gettext* share/libtool* \
                | (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