summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2002-11-21 16:53:00 +0000
committerKeith Packard <keithp@keithp.com>2002-11-21 16:53:00 +0000
commit02c3d2e9eabcecdcc46bc166afc511b22f3ddbae (patch)
tree57c0aca9a2c410d20c3dc4a64402d207e2158684
parent61afb67cd23d021b5b3806f6974e19a77a2ac4ef (diff)
Use unique local Imake define for fonts.conf dir (#5482, Mike A. Harris)
-rw-r--r--Imakefile14
1 files changed, 7 insertions, 7 deletions
diff --git a/Imakefile b/Imakefile
index 215d652..4f6313e 100644
--- a/Imakefile
+++ b/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 PassCDebugFlags
@@ -9,15 +9,15 @@ SUBDIRS=fontconfig $(LINTSUBDIRS)
FONTCONFIG_REVISION=1
-#ifndef FontconfigDir
+#ifndef FontconfigFontsConfDir
#if NothingOutsideProjectRoot
-#define FontconfigDir $(PROJECTROOT)/etc/fonts
+#define FontconfigFontsConfDir $(PROJECTROOT)/etc/fonts
#else
-#define FontconfigDir /etc/fonts
+#define FontconfigFontsConfDir /etc/fonts
#endif
#endif
-FONTCONFIGDIR=FontconfigDir
+FONTCONFIGFONTSCONFDIR=FontconfigFontsConfDir
#if NothingOutsideProjectRoot
FONTDIRS=$(FONTDIR)
@@ -49,8 +49,8 @@ step:: srcname @@\
InstallNamedTargetBackup(install,file,$(INSTDATFLAGS),dest,file)
#endif /* InstallNonExecFileBackup */
-InstallNonExecFileBackup(fonts.conf,$(FONTCONFIGDIR))
-InstallNonExecFile(fonts.dtd,$(FONTCONFIGDIR))
+InstallNonExecFileBackup(fonts.conf,$(FONTCONFIGFONTSCONFDIR))
+InstallNonExecFile(fonts.dtd,$(FONTCONFIGFONTSCONFDIR))
all:: fonts.conf