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 63913f9aec03b54bff57428c28fc24f69fc353ed..4861d46f5d08eb10f4f3760483234f0c6cf52102 100644 (file)
--- 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 7b67238415c1579c0a45f767c6594bbbebc55e38..baccc8afc49ae0de2151707eb1a85e02738d0b81 100644 (file)
--- 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 109d9eea567767ec24506140a4fca1db84e90be6..4df62022f38997f52fdfdcf2c8cf02c98457e105 100755 (executable)
--- 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