Pass FONTCONFIG_PATH in arguments to get expanded

diff --git a/src/Makefile.am b/src/Makefile.am
index 949c5a3cd68afb4c739e13949b46cfcbb8e52acf..a30604e763770a65046d6c259f762a75813f33e3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,6 +44,7 @@ endif
 INCLUDES =                                             \
        $(FREETYPE_CFLAGS)                              \
        $(EXPAT_CFLAGS)                                 \
+       -DFONTCONFIG_PATH='"$(CONFDIR)"'                \
        -I$(top_srcdir)                                 \
        -I$(top_srcdir)/src
 

diff --git a/src/fccfg.c b/src/fccfg.c
index 68b548f53c99eff951e378ea28b5633ef3d13398..87c38bc9f0e0b3f78ff67ed0ea30419e729d5a24 100644 (file)
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -1390,10 +1390,6 @@ DllMain (HINSTANCE hinstDLL,
 
 #else /* !(_WIN32 && PIC) */
 
-#ifndef FONTCONFIG_PATH
-#define FONTCONFIG_PATH        "/etc/fonts"
-#endif
-
 #endif /* !(_WIN32 && PIC) */
 
 #ifndef FONTCONFIG_FILE