Pass FONTCONFIG_PATH in arguments to get expanded

2003-04-17 21:50:24 +00:00 · 2003-04-17 21:50:24 +00:00 · 3a30abdb84
parent 2b2f2a714a
commit 3a30abdb84
2 changed files with 1 additions and 4 deletions
--- 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

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