* Updated the contrib system to work with the new id gcc-4 returns for Tiger

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index d93af1c61f8b610379d5b18958617f10bbc9658c..1878da1101af0ced010fd007486b0fa0b887df6c 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -46,7 +46,7 @@ echo "BUILD = $BUILD" >> config.mak
 echo "HOST = $HOST" >> config.mak
 
 case $HOST in
-    ppc-darwin)
+    powerpc-apple-darwin8 | ppc-darwin)
            echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak
            echo "CONTRIB_URL = http://download.videolan.org/pub/videolan/devtools/contrib-macosx.tar.bz2" >> config.mak
         ;;

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ad7b0f4d192d7e739114075040a9420ef4899525..1237bba6c51510efd7b8018b31901e37e734538b 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -30,6 +30,13 @@ include ./packages.mak
 # ***************************************************************************
 
 ifeq ($(HOST),ppc-darwin)
+HAVE_DARWIN_OS=1
+endif
+ifeq ($(HOST),powerpc-apple-darwin8)
+HAVE_DARWIN_OS=1
+endif
+
+ifdef HAV_DARWIN_OS
 export PATH = $(PREFIX)/bin:/bin:/usr/bin
 export DYLD_LIBRARY_PATH = $(PREFIX)/lib
 endif
@@ -74,7 +81,7 @@ endif
 # Standard rules
 # ***************************************************************************
 
-ifeq ($(HOST),ppc-darwin)
+ifdef HAVE_DARWIN_OS
 all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
        .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .openslp \
@@ -130,7 +137,7 @@ endef
 #      $(INSTALL_NAME)
 #      touch $@
 
-ifeq ($(HOST),ppc-darwin)
+ifdef HAVE_DARWIN_OS
 define INSTALL_NAME_LIB
        install_name_tool \
                -change $(PREFIX)/lib/$(shell cd $(PREFIX)/lib; ls | grep "lib$(INSTALL_LIB).[0-9]*.dylib") \
@@ -208,7 +215,7 @@ DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.gz
 # libtool
 # ***************************************************************************
 
-ifeq ($(BUILD),ppc-darwin)
+ifdef HAVE_DARWIN_OS
 .libtool:
        if test -x /usr/bin/glibtoolize; then \
                ln -sf /usr/bin/glibtoolize $(PREFIX)/bin/libtoolize ; \
@@ -761,7 +768,7 @@ libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
 libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
        $(EXTRACT_GZ)
        patch -p 0 < Patches/dvdnav.patch
-ifeq ($(BUILD),ppc-darwin)
+ifdef HAVE_DARWIN_OS
        (cd $@; autoconf)
 else
        (cd $@; ./autogen.sh noconfig)
@@ -942,7 +949,7 @@ vcdimager-$(VCDIMAGER_VERSION).tar.gz:
 vcdimager: vcdimager-$(VCDIMAGER_VERSION).tar.gz
        $(EXTRACT_GZ)
 
-ifeq ($(HOST),ppc-darwin)
+ifdef HAVE_DARWIN_OS
 .vcdimager: vcdimager
        (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static LDFLAGS="$(LDFLAGS) -framework CoreFoundation -framework IOKit" && make && make install)
        touch $@