[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 conf.d/Makefile.am |   11 ++++++++---
 conf.d/README      |   23 -----------------------
 conf.d/README.in   |   23 +++++++++++++++++++++++
 3 files changed, 31 insertions(+), 26 deletions(-)

New commits:
commit 93137252cfab1c38e1c9137d831c177665e0592a
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon May 13 12:14:29 2013 +0900

    Bug 63452 - conf.d/README outdated
    
    reflect correct path where is configured at the build time.

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index 77597e5..e1fab50 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -21,8 +21,9 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-DOC_FILES= \
-	README
+BUILT_SOURCES = README
+DOC_SOURCES = README.in
+DOC_FILES = $(DOC_SOURCES:.in=)
 
 CONF_LINKS = \
 	10-scale-bitmap-fonts.conf \
@@ -41,7 +42,8 @@ CONF_LINKS = \
 	80-delicious.conf \
 	90-synthetic.conf
 
-EXTRA_DIST = $(template_DATA) $(DOC_FILES)
+EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
+CLEANFILES = $(DOC_FILES)
 
 configdir=$(CONFIGDIR)
 config_DATA = $(DOC_FILES)
@@ -78,6 +80,9 @@ template_DATA =				\
 	80-delicious.conf		\
 	90-synthetic.conf
 
+README: $(srcdir)/README.in
+	sed "s|\@TEMPLATEDIR\@|$(templatedir)|" $< > $@
+
 install-data-hook:
 	mkdir -p $(DESTDIR)$(configdir)
 	@(echo cd $(DESTDIR)$(configdir);			\
diff --git a/conf.d/README b/conf.d/README
deleted file mode 100644
index c2fb52c..0000000
--- a/conf.d/README
+++ /dev/null
@@ -1,23 +0,0 @@
-conf.d/README
-
-Each file in this directory is a fontconfig configuration file.  Fontconfig
-scans this directory, loading all files of the form [0-9][0-9]*.conf.
-These files are normally installed in ../conf.avail and then symlinked here,
-allowing them to be easily installed and then enabled/disabled by adjusting
-the symlinks.
-
-The files are loaded in numeric order, the structure of the configuration
-has led to the following conventions in usage:
-
- Files begining with:	Contain:
- 
- 00 through 09		Font directories
- 10 through 19		system rendering defaults (AA, etc)
- 20 through 29		font rendering options
- 30 through 39		family substitution
- 40 through 49		generic identification, map family->generic
- 50 through 59		alternate config file loading
- 60 through 69		generic aliases, map generic->family
- 70 through 79		select font (adjust which fonts are available)
- 80 through 89		match target="scan" (modify scanned patterns)
- 90 through 99		font synthesis
diff --git a/conf.d/README.in b/conf.d/README.in
new file mode 100644
index 0000000..90c45de
--- /dev/null
+++ b/conf.d/README.in
@@ -0,0 +1,23 @@
+conf.d/README
+
+Each file in this directory is a fontconfig configuration file.  Fontconfig
+scans this directory, loading all files of the form [0-9][0-9]*.conf.
+These files are normally installed in @TEMPLATEDIR@
+and then symlinked here, allowing them to be easily installed and then
+enabled/disabled by adjusting the symlinks.
+
+The files are loaded in numeric order, the structure of the configuration
+has led to the following conventions in usage:
+
+ Files begining with:	Contain:
+ 
+ 00 through 09		Font directories
+ 10 through 19		system rendering defaults (AA, etc)
+ 20 through 29		font rendering options
+ 30 through 39		family substitution
+ 40 through 49		generic identification, map family->generic
+ 50 through 59		alternate config file loading
+ 60 through 69		generic aliases, map generic->family
+ 70 through 79		select font (adjust which fonts are available)
+ 80 through 89		match target="scan" (modify scanned patterns)
+ 90 through 99		font synthesis