Update Makefile.am to match conf.avail changes

[fontconfig.git] / fonts.conf.in

diff --git a/fonts.conf.in b/fonts.conf.in
index b8855ba9308264aea863fae5378e127b70a3f19f..a4f33894784ed326ba3ae719916fb113a60b8268 100644 (file)
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -282,17 +282,6 @@
                </edit>
        </match>
 
-<!--
-  Load per-user customization file
--->
-       <include ignore_missing="yes">~/.fonts.conf</include>
-
-<!--
-  Load local system customization file
--->
-       <include ignore_missing="yes">conf.d</include>
-       <include ignore_missing="yes">local.conf</include>
-
 <!--
   Provide required aliases for standard names
 -->
@@ -308,12 +297,12 @@
                        <family>Times</family>
                        <family>Frank Ruehl</family>
                        <family>MgOpen Canonica</family>
-                       <family>FreeSerif</family>
                        <family>Kochi Mincho</family>
                        <family>AR PL SungtiL GB</family>
                        <family>AR PL Mingti2L Big5</family>
                        <family>ＭＳ 明朝</family>
                        <family>Baekmuk Batang</family>
+                       <family>FreeSerif</family>
                </prefer>
        </alias>
        <alias>
@@ -329,13 +318,13 @@
                        <family>Helvetica</family>
                        <family>Nachlieli</family>
                        <family>MgOpen Modata</family>
-                       <family>FreeSans</family>
                        <family>Kochi Gothic</family>
                        <family>AR PL KaitiM GB</family>
                        <family>AR PL KaitiM Big5</family>
                        <family>ＭＳ ゴシック</family>
                        <family>Baekmuk Dotum</family>
                        <family>SimSun</family>
+                       <family>FreeSans</family>
                </prefer>
        </alias>
        <alias>
@@ -350,10 +339,10 @@
                        <family>Nimbus Mono L</family>
                        <family>Courier</family>
                        <family>Miriam Mono</family>
-                       <family>FreeMono</family>
                        <family>Kochi Gothic</family>
                        <family>AR PL KaitiM GB</family>
                        <family>Baekmuk Dotum</family>
+                       <family>FreeMono</family>
                </prefer>
        </alias>