From: James Cloos <cloos@lugabout.jhcloos.org>
Date: Mon, 4 Sep 2006 05:33:09 +0000 (-0400)
Subject: Move user and local conf file loading into conf.avail files
X-Git-Tag: 2.4.0~8^2~8
X-Git-Url: https://git.wh0rd.org/?p=fontconfig.git;a=commitdiff_plain;h=57b42cef2ad2f18618ca0748325fc800165bdc1b

Move user and local conf file loading into conf.avail files
---

diff --git a/conf.avail/50-user.conf b/conf.avail/50-user.conf
new file mode 100644
index 0000000..9a38a40
--- /dev/null
+++ b/conf.avail/50-user.conf
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/conf.avail/50-user.conf file to configure system font access -->
+<fontconfig>
+	<!-- Load per-user customization file -->
+	<include ignore_missing="yes">~/.fonts.conf</include>
+</fontconfig>
diff --git a/conf.avail/51-local.conf b/conf.avail/51-local.conf
new file mode 100644
index 0000000..d35046e
--- /dev/null
+++ b/conf.avail/51-local.conf
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<!-- /etc/fonts/conf.avail/51-local.conf file to configure system font access -->
+<fontconfig>
+	<!-- Load local system customization file -->
+	<include ignore_missing="yes">local.conf</include>
+</fontconfig>
diff --git a/fonts.conf.in b/fonts.conf.in
index adc44e8..a4f3389 100644
--- 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
 -->