From 3a30abdb84ff973be86d4f75ee2fd54099f32ef1 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 17 Apr 2003 21:50:24 +0000 Subject: [PATCH] Pass FONTCONFIG_PATH in arguments to get expanded --- src/Makefile.am | 1 + src/fccfg.c | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) 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 -- 2.39.5