[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 fc-cat/fc-cat.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fe6ba5e5c54928adeaf96668d0cf6f44f0484065
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Mar 28 16:27:46 2012 +0900

    Fix the hardcoded cache file suffix

diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c
index c3d6829..b273f25 100644
--- a/fc-cat/fc-cat.c
+++ b/fc-cat/fc-cat.c
@@ -150,11 +150,11 @@ usage (char *program, int error)
 {
     FILE *file = error ? stderr : stdout;
 #if HAVE_GETOPT_LONG
-    fprintf (file, "usage: %s [-rv] [--recurse] [--verbose] [*-%s.cache-2|directory]...\n",
+    fprintf (file, "usage: %s [-rv] [--recurse] [--verbose] [*-%s" FC_CACHE_SUFFIX "|directory]...\n",
 	     program, FC_ARCHITECTURE);
     fprintf (file, "       %s [-Vh] [--version] [--help]\n", program);
 #else
-    fprintf (file, "usage: %s [-rvVh] [*-%s.cache-2|directory]...\n",
+    fprintf (file, "usage: %s [-rvVh] [*-%s" FC_CACHE_SUFFIX "|directory]...\n",
 	     program, FC_ARCHITECTURE);
 #endif
     fprintf (file, "Reads font information cache from:\n");