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

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Jan 23 21:27:14 2011 +0100| [689940a26f6915510a5fb66c6e8f7e58fd6a6bd5] | committer: Felix Paul Kühne

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=689940a26f6915510a5fb66c6e8f7e58fd6a6bd5
---

 extras/contrib/contrib.mak         |    2 +-
 extras/contrib/src/contrib-src.mak |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extras/contrib/contrib.mak b/extras/contrib/contrib.mak
index 315f696..1dbb6ea 100644
--- 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 79f3bbb..15c59d2 100644
--- 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 at 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  \