Use unique local Imake define for fonts.conf dir (#5482, Mike A. Harris)
This commit is contained in:
parent
61afb67cd2
commit
02c3d2e9ea
14
Imakefile
14
Imakefile
|
@ -1,4 +1,4 @@
|
||||||
XCOMM $XFree86: xc/lib/fontconfig/Imakefile,v 1.7 2002/08/01 16:17:33 keithp Exp $
|
XCOMM $XFree86: xc/lib/fontconfig/Imakefile,v 1.8 2002/11/15 09:29:35 alanh Exp $
|
||||||
|
|
||||||
#define IHaveSubdirs
|
#define IHaveSubdirs
|
||||||
#define PassCDebugFlags
|
#define PassCDebugFlags
|
||||||
|
@ -9,15 +9,15 @@ SUBDIRS=fontconfig $(LINTSUBDIRS)
|
||||||
|
|
||||||
FONTCONFIG_REVISION=1
|
FONTCONFIG_REVISION=1
|
||||||
|
|
||||||
#ifndef FontconfigDir
|
#ifndef FontconfigFontsConfDir
|
||||||
#if NothingOutsideProjectRoot
|
#if NothingOutsideProjectRoot
|
||||||
#define FontconfigDir $(PROJECTROOT)/etc/fonts
|
#define FontconfigFontsConfDir $(PROJECTROOT)/etc/fonts
|
||||||
#else
|
#else
|
||||||
#define FontconfigDir /etc/fonts
|
#define FontconfigFontsConfDir /etc/fonts
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
FONTCONFIGDIR=FontconfigDir
|
FONTCONFIGFONTSCONFDIR=FontconfigFontsConfDir
|
||||||
|
|
||||||
#if NothingOutsideProjectRoot
|
#if NothingOutsideProjectRoot
|
||||||
FONTDIRS=$(FONTDIR)
|
FONTDIRS=$(FONTDIR)
|
||||||
|
@ -49,8 +49,8 @@ step:: srcname @@\
|
||||||
InstallNamedTargetBackup(install,file,$(INSTDATFLAGS),dest,file)
|
InstallNamedTargetBackup(install,file,$(INSTDATFLAGS),dest,file)
|
||||||
#endif /* InstallNonExecFileBackup */
|
#endif /* InstallNonExecFileBackup */
|
||||||
|
|
||||||
InstallNonExecFileBackup(fonts.conf,$(FONTCONFIGDIR))
|
InstallNonExecFileBackup(fonts.conf,$(FONTCONFIGFONTSCONFDIR))
|
||||||
InstallNonExecFile(fonts.dtd,$(FONTCONFIGDIR))
|
InstallNonExecFile(fonts.dtd,$(FONTCONFIGFONTSCONFDIR))
|
||||||
|
|
||||||
all:: fonts.conf
|
all:: fonts.conf
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue