From: Keith Packard <keithp@keithp.com>
Date: Thu, 1 Aug 2002 16:17:33 +0000 (+0000)
Subject: Always install fonts.conf and fonts.dtd, moving any existing fonts.conf to
X-Git-Tag: fcpackage_rc2~9
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a6531d8cbafd79f26d06b086cceccb461e661f4a;p=fontconfig.git

Always install fonts.conf and fonts.dtd, moving any existing fonts.conf to
    fonts.conf.bak. Add ~/.fonts to default font directories and add some
    useful comments to fonts.conf
---

diff --git a/Imakefile b/Imakefile
index 63913f9..4861d46 100644
--- a/Imakefile
+++ b/Imakefile
@@ -26,8 +26,21 @@ DependSubdirs($(SUBDIRS))
 MakeLintLibSubdirs($(LINTSUBDIRS))
 MakeLintSubdirs($(LINTSUBDIRS),install.ln,install.ln)
 
-InstallNonExecFileNoClobber(fonts.conf,$(FONTCONFIGDIR))
-InstallNonExecFileNoClobber(fonts.dtd,$(FONTCONFIGDIR))
+#ifndef InstallNamedTargetBackup
+#define InstallNamedTargetBackup(step,srcname,flags,dest,dstname)	@@\
+step:: srcname								@@\
+	MakeDir($(DESTDIR)dest)						@@\
+	MoveToBakFile($(DESTDIR)dest/dstname)				@@\
+	$(INSTALL) $(INSTALLFLAGS) flags srcname $(DESTDIR)dest/dstname
+#endif /* InstallNamedTargetBackup */
+
+#ifndef InstallNonExecFileBackup
+#define InstallNonExecFileBackup(file,dest)				@@\
+InstallNamedTargetBackup(install,file,$(INSTDATFLAGS),dest,file)
+#endif /* InstallNonExecFileBackup */
+
+InstallNonExecFileBackup(fonts.conf,$(FONTCONFIGDIR))
+InstallNonExecFile(fonts.dtd,$(FONTCONFIGDIR))
 
 all:: fonts.conf
 
diff --git a/fonts.conf.in b/fonts.conf.in
index 7b67238..baccc8a 100644
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -3,6 +3,17 @@
 <!-- /etc/fonts.conf file to configure system font access -->
 <fontconfig>
 
+<!--
+	The intent of this standard configuration file is to be adequate for
+	most environments.  If you have a reasonably normal environment and
+	have found problems with this configuration, they are probably
+	things that others will also want fixed.  Please send any suggested
+	changes to fonts@xfree86.org so that future releases can include
+	such changes.
+
+	Keith Packard
+-->
+
 <!-- FONTPATH_START -->
 
 <!-- 
@@ -11,6 +22,7 @@
 
 	<dir>/usr/X11R6/lib/X11/fonts</dir>
  	<dir>/usr/share/fonts</dir>
+	<dir>~/.fonts</dir>
 
 <!-- FONTPATH_END -->
 
diff --git a/setfontdirs b/setfontdirs
index 109d9ee..4df6202 100755
--- a/setfontdirs
+++ b/setfontdirs
@@ -15,9 +15,11 @@ ed fonts.conf << EOF
 .
 +r $FONTDIRS
 a
+	<dir>~/.fonts</dir>
 
 .
 /FONTPATH_START/,/FONTPATH_END/d
+
 w
 q
 EOF