Commit 61afb67c authored by Alan Hourihane's avatar Alan Hourihane
Browse files

483. Fix fontconfig to obey NothingOutsideProjectRoot, so that the

    directory /usr/share/fonts is ignored in this case (#A.1325, Joe Moss).
parent 65fb1c65
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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment