-all: FORCE
-# @echo "Do you mean to make src or make bin ?"
- @echo " 'make bin' isn't functional at the moment,"
- @echo " running 'make src' instead..."
- $(MAKE) src
-
-src: FORCE
- $(MAKE) -C src all
-
-contrib-macosx.tar.bz2: FORCE
- $(WGET) $(CONTRIB_URL)
-
-bin: FORCE
- @echo "make bin isn't in a functional state at this moment. Please use make src"
-
-#The disabled make bin
-#bin: contrib-macosx.tar.bz2
-# @if test -d tmp; then \
-# echo "Move away ./tmp, it's in the way" ; \
-# exit 1 ; \
-# fi
-# mkdir tmp
-# bunzip2 -c $< | (cd tmp; tar xf -)
-# ./change_prefix.sh tmp @@CONTRIB_PREFIX@@ $(PREFIX)
-# (cd tmp; tar cf - .) | tar xf -
-# rm -rf tmp
-# ranlib lib/*\.a
-
-clean-src: FORCE
+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=2
+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 \
+ echo "Move away ./tmp, it's in the way" ; \
+ exit 1 ; \
+ fi
+ mkdir tmp
+ (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
+ rm -rf tmp
+endif
+
+clean-src: