From: Keith Packard <keithp@keithp.com>
Date: Thu, 17 Apr 2003 21:50:24 +0000 (+0000)
Subject: Pass FONTCONFIG_PATH in arguments to get expanded
X-Git-Tag: fc-2_2_0~4
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=3a30abdb84ff973be86d4f75ee2fd54099f32ef1;p=fontconfig.git

Pass FONTCONFIG_PATH in arguments to get expanded
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 949c5a3..a30604e 100644
--- 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 68b548f..87c38bc 100644
--- 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