walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

483. Fix fontconfig to obey NothingOutsideProjectRoot, so that the 

directory /usr/share/fonts is ignored in this case (#A.1325, Joe Moss).
This commit is contained in:
Alan Hourihane 2002-11-15 09:29:35 +00:00
parent 65fb1c6583
commit 61afb67cd2
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Imakefile
View File

@ -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 IHaveSubdirs
#define PassCDebugFlags #define PassCDebugFlags
@ -10,11 +10,21 @@ SUBDIRS=fontconfig $(LINTSUBDIRS)
FONTCONFIG_REVISION=1 FONTCONFIG_REVISION=1
#ifndef FontconfigDir #ifndef FontconfigDir
#if NothingOutsideProjectRoot
#define FontconfigDir $(PROJECTROOT)/etc/fonts
#else
#define FontconfigDir /etc/fonts #define FontconfigDir /etc/fonts
#endif #endif
#endif
FONTCONFIGDIR=FontconfigDir FONTCONFIGDIR=FontconfigDir
#if NothingOutsideProjectRoot
FONTDIRS=$(FONTDIR)
#else
FONTDIRS=/usr/share/fonts $(FONTDIR)
#endif
SUBSTVARS=prefix=$(PROJECTROOT) \ SUBSTVARS=prefix=$(PROJECTROOT) \
exec_prefix=$(BINDIR) \ exec_prefix=$(BINDIR) \
libdir=$(USRLIBDIR) \ libdir=$(USRLIBDIR) \
@ -46,7 +56,7 @@ all:: fonts.conf
fonts.conf: fonts.conf.in fonts.conf: fonts.conf.in
RemoveFile($@) RemoveFile($@)
sh ./setfontdirs /usr/share/fonts $(FONTDIR) sh ./setfontdirs $(FONTDIRS)
clean:: clean::
RemoveFile(fonts.conf) RemoveFile(fonts.conf)