[vlc-devel] commit: contrib: add fontconfig cache and conf locations. ( Derk-Jan Hartman )

[git version control]

vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Mon Sep 22 20:12:22 2008 +0200| [c5ffe15d9da6d0a044d461519afa9588f689ed48] | committer: Derk-Jan Hartman 

contrib: add fontconfig cache and conf locations.

For Mac OS X, let's now use the default X11 locations for the fonts.conf and the cache files.
Those that do not have X11 installed (old default < 10.4) are simply out of luck.
They will only be able to use the files in /System/Library/Fonts and will need to rebuild
their cache every time.

We should also fix this for windows. I'm looking for other projects that use fontconfig on
Windows to see if I can get some hints on how to do this.

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

 extras/contrib/src/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 4fdc1d4..16025aa 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -473,7 +473,7 @@ ifdef HAVE_WIN32
   endif
 else
   ifdef HAVE_DARWIN_OS
-	(cd $<; $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/var/cache/fontconfig --with-default-fonts=/System/Library/Fonts --with-add-fonts=/Library/Fonts,~/Library/Fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install-exec && (cd fontconfig ; make install-data) && cp fontconfig.pc $(PKG_CONFIG_LIBDIR))
+	(cd $<; $(HOSTCC) LIBXML2_CFLAGS=`xml2-config --cflags` LIBXML2_LIBS=`xml2-config --libs` ./configure $(HOSTCONF) --with-cache-dir=/usr/X11/var/cache/fontconfig --with-confdir=/usr/X11/lib/X11/fonts --with-default-fonts=/System/Library/Fonts --with-add-fonts=/Library/Fonts,~/Library/Fonts --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install-exec && (cd fontconfig ; make install-data) && cp fontconfig.pc $(PKG_CONFIG_LIBDIR))
   else
 	(cd $<; $(HOSTCC) LIBXML2_CFLAGS=`$(PREFIX)/bin/xml2-config --cflags` ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-freetype-config=$(PREFIX)/bin/freetype-config --enable-libxml2 --disable-docs && make && make install)
   endif