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
This commit is contained in:
Keith Packard 2002-08-01 16:17:33 +00:00
parent aefb2c41c8
commit a6531d8cba
3 changed files with 29 additions and 2 deletions

View File

@ -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

View File

@ -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 -->

View File

@ -15,9 +15,11 @@ ed fonts.conf << EOF
.
+r $FONTDIRS
a
<dir>~/.fonts</dir>
.
/FONTPATH_START/,/FONTPATH_END/d
w
q
EOF