diff options
| author | jstebbins <[email protected]> | 2012-01-09 17:45:28 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2012-01-09 17:45:28 +0000 |
| commit | 19f6610d3d3bc0a4144a7612294a47bfcf307371 (patch) | |
| tree | 8d7f1696975fd1e69ce426db15649a640181f3d2 /contrib/fontconfig/module.defs | |
| parent | 54e6a851ccec4be58087f8d90d4e04fb2623b4b5 (diff) | |
Fix fontconfig search path for linux and osx
It was searching for .../contrib/etc/fonts. Needed to be set to the
standard search paths on the respective systems.
On windows, it already searches the directory fonts under the
executables directory. We need to put a copy of fonts.conf there. This
can be copied from contrib/etc/fonts/fonts.conf
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4405 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/fontconfig/module.defs')
| -rw-r--r-- | contrib/fontconfig/module.defs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/contrib/fontconfig/module.defs b/contrib/fontconfig/module.defs index 78e819422..23091597b 100644 --- a/contrib/fontconfig/module.defs +++ b/contrib/fontconfig/module.defs @@ -80,3 +80,15 @@ FONTCONFIG.CONFIGURE.extra = \ LIBXML2_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lxml2" \ LIBXML2_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/libxml2" \ $(FONTCONFIG.config_archoption) +ifeq (darwin,$(BUILD.system)) +FONTCONFIG.CONFIGURE.extra += \ + --with-fcpath=/usr/X11/lib/X11/fontconfig \ + --with-cache-dir=/usr/X11/var/cache/fontconfig +else ifeq (linux,$(BUILD.system)) +FONTCONFIG.CONFIGURE.extra += \ + --with-fcpath=/etc/fonts \ + --with-cache-dir=/var/cache/fontconfig +endif + +# disable fc-cache test during install phase +FONTCONFIG.INSTALL.extra = RUN_FC_CACHE_TEST=false |