Commit 3a30abdb authored by Keith Packard's avatar Keith Packard
Browse files

Pass FONTCONFIG_PATH in arguments to get expanded

parent 2b2f2a71
...@@ -44,6 +44,7 @@ endif ...@@ -44,6 +44,7 @@ endif
INCLUDES = \ INCLUDES = \
$(FREETYPE_CFLAGS) \ $(FREETYPE_CFLAGS) \
$(EXPAT_CFLAGS) \ $(EXPAT_CFLAGS) \
-DFONTCONFIG_PATH='"$(CONFDIR)"' \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/src -I$(top_srcdir)/src
......
...@@ -1390,10 +1390,6 @@ DllMain (HINSTANCE hinstDLL, ...@@ -1390,10 +1390,6 @@ DllMain (HINSTANCE hinstDLL,
#else /* !(_WIN32 && PIC) */ #else /* !(_WIN32 && PIC) */
#ifndef FONTCONFIG_PATH
#define FONTCONFIG_PATH "/etc/fonts"
#endif
#endif /* !(_WIN32 && PIC) */ #endif /* !(_WIN32 && PIC) */
#ifndef FONTCONFIG_FILE #ifndef FONTCONFIG_FILE
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment