contribs: set a proper location for the fontconfig cache to fix continous re-creation

diff --git a/extras/contrib/contrib.mak b/extras/contrib/contrib.mak
index 315f69611908ce41014c429f57d00028313bebe6..1dbb6ea431eb214a6318721e520c30c1cb9d9897 100644 (file)
--- a/extras/contrib/contrib.mak
+++ b/extras/contrib/contrib.mak
@@ -49,7 +49,7 @@ src: using-src
 
 ifdef HAVE_DARWIN_OS
 
-CONTRIBREV=39
+CONTRIBREV=40
 
 contrib-macosx-$(ARCH)-$(CONTRIBREV).tar.bz2:
        $(WGET) http://downloads.videolan.org/pub/videolan/testing/contrib/$@

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 79f3bbbed2e0ca34c29821f5cf0af561fa2f7c4c..15c59d2d8b8e5b400ff28234b5b747c5d7817ca1 100644 (file)
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -1,7 +1,7 @@
 #***************************************************************************
 # src/Makefile : Dearchive and compile all files necessary
 # ***************************************************************************
-# Copyright (C) 2003 - 2010 the VideoLAN team
+# Copyright (C) 2003 - 2011 the VideoLAN team
 # $Id$
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -400,7 +400,7 @@ FONTCONFIG_BASE_CONF = --prefix=$(PREFIX) \
 
 FONTCONFIG_CONF-$(ENABLED)      = $(HOSTCONF) $(FONTCONFIG_BASE_CONF)
 FONTCONFIG_CONF-$(HAVE_MACOSX) += $(HOSTCONF) \
-       --with-cache-dir=/usr/X11/var/cache/fontconfig \
+       --with-cache-dir=~/Library/Caches/fontconfig \
        --with-confdir=/usr/X11/lib/X11/fonts \
        --with-default-fonts=/System/Library/Fonts \
        --with-add-fonts=/Library/Fonts,~/Library/Fonts  \