Pass FONTCONFIG_PATH in arguments to get expanded

This commit is contained in:
Keith Packard 2003-04-17 21:50:24 +00:00
parent 2b2f2a714a
commit 3a30abdb84
2 changed files with 1 additions and 4 deletions

View File

@ -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

View File

@ -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