From: Alan Hourihane <alanh@fairlite.demon.co.uk>
Date: Fri, 15 Nov 2002 09:29:35 +0000 (+0000)
Subject: 483. Fix fontconfig to obey NothingOutsideProjectRoot, so that the
X-Git-Tag: fcpackage_2_1~2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=61afb67cd23d021b5b3806f6974e19a77a2ac4ef;p=fontconfig.git

483. Fix fontconfig to obey NothingOutsideProjectRoot, so that the
    directory /usr/share/fonts is ignored in this case (#A.1325, Joe Moss).
---

diff --git a/Imakefile b/Imakefile
index 4861d46..215d652 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XFree86: xc/lib/fontconfig/Imakefile,v 1.5 2002/05/25 13:52:37 herrb Exp $
+XCOMM $XFree86: xc/lib/fontconfig/Imakefile,v 1.7 2002/08/01 16:17:33 keithp Exp $
 
 #define IHaveSubdirs
 #define PassCDebugFlags
@@ -10,11 +10,21 @@ SUBDIRS=fontconfig $(LINTSUBDIRS)
 FONTCONFIG_REVISION=1
 
 #ifndef FontconfigDir
+#if NothingOutsideProjectRoot
+#define FontconfigDir $(PROJECTROOT)/etc/fonts
+#else
 #define FontconfigDir /etc/fonts
 #endif
+#endif
 
 FONTCONFIGDIR=FontconfigDir
 
+#if NothingOutsideProjectRoot
+FONTDIRS=$(FONTDIR)
+#else
+FONTDIRS=/usr/share/fonts $(FONTDIR)
+#endif
+
 SUBSTVARS=prefix=$(PROJECTROOT) \
 	  exec_prefix=$(BINDIR) \
 	  libdir=$(USRLIBDIR) \
@@ -46,7 +56,7 @@ all:: fonts.conf
 
 fonts.conf: fonts.conf.in
 	RemoveFile($@)
-	sh ./setfontdirs /usr/share/fonts $(FONTDIR)
+	sh ./setfontdirs $(FONTDIRS)
 
 clean::
 	RemoveFile(fonts.conf)