summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorOleg Oshmyan <[email protected]>2017-03-10 21:53:33 +0200
committerJohn Stebbins <[email protected]>2017-03-10 12:53:33 -0700
commitabe8b106dc881aa1e7e0c6f0b57f21795b98afa3 (patch)
treed1b7c505e625f1376723854bc396f022bcae81fa /contrib
parent65e24973e7deff59f93caabd1d561c8d0d2e9163 (diff)
Actually set Fontconfig configuration path (#611)
Option --with-fcpath does not exist and never did. We had a patch that added it, but the patch has been removed. Use the standard option instead.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/fontconfig/module.defs4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/fontconfig/module.defs b/contrib/fontconfig/module.defs
index 2423ccc27..d585b3191 100644
--- a/contrib/fontconfig/module.defs
+++ b/contrib/fontconfig/module.defs
@@ -91,13 +91,13 @@ ifeq (darwin,$(BUILD.system))
FONTCONFIG.CONFIGURE.extra += \
LIBXML2_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lxml2" \
LIBXML2_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/libxml2" \
- --with-fcpath=/usr/X11/lib/X11/fontconfig \
+ --with-baseconfigdir=/usr/X11/lib/X11/fontconfig \
--with-cache-dir=~/Library/Caches/fontconfig \
--with-default-fonts=/Library/Fonts \
--with-add-fonts=/System/Library/Fonts,/Library/Fonts,~/Library/Fonts
else ifeq (linux,$(BUILD.system))
FONTCONFIG.CONFIGURE.extra += \
- --with-fcpath=/etc/fonts \
+ --with-baseconfigdir=/etc/fonts \
--with-cache-dir=/var/cache/fontconfig
endif