[Fontconfig] fontconfig: Branch 'fc-2_4-keithp' - 2 commits

[Keith Packard]

 fc-cache/Makefile.am |    6 ++----
 fc-cat/Makefile.am   |    2 --
 src/fcname.c         |    4 ++++
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
diff-tree 551b6b2cd7d94dd90a9eb22bdb752f264afc48ce (from bf0c80fc4996157dda7bed8b8b2e4c8a13611ada)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Thu Aug 31 18:16:00 2006 -0700

    Allow FcTypeLangSet to match either FcTypeLangSet or FcTypeString.
    
    Applications explicitly setting FC_LANG with string would fail due
    to typechecking disallowing this case.

diff --git a/src/fcname.c b/src/fcname.c
index 74411d7..f55190d 100644
--- a/src/fcname.c
+++ b/src/fcname.c
@@ -301,6 +301,10 @@ FcObjectValidType (FcObject object, FcTy
 	    if (type == FcTypeDouble || type == FcTypeInteger)
 		return FcTrue;
 	    break;
+	case FcTypeLangSet:
+	    if (type == FcTypeLangSet || type == FcTypeString)
+		return FcTrue;
+	    break;
 	default:
 	    if (type == t->type)
 		return FcTrue;
diff-tree bf0c80fc4996157dda7bed8b8b2e4c8a13611ada (from f57783d2e9c7362b1e5d5e3a967ba90fa49ade6e)
Author: Keith Packard <keithp at neko.keithp.com>
Date:   Thu Aug 31 18:14:45 2006 -0700

    Change $(pkgcachedir) to $(fc_cachedir) in fc-cat and fc-cache Makefile.am
    
    make distcheck caught this bug; the effect of 'make uninstall'
    would have been to execute 'rm -rf /', somewhat less that desirable.

diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
index 3700c4a..4bb767b 100644
--- a/fc-cache/Makefile.am
+++ b/fc-cache/Makefile.am
@@ -27,13 +27,11 @@ FC_CACHE_SRC=${top_srcdir}/fc-cache
 
 SGML = ${FC_CACHE_SRC}/fc-cache.sgml
 
-AM_CPPFLAGS = -DPKGCACHEDIR='"${pkgcachedir}"'
-
 install-data-local:
-	-$(mkinstalldirs) "$(DESTDIR)$(pkgcachedir)"
+	-$(mkinstalldirs) "$(DESTDIR)$(fc_cachedir)"
 
 uninstall-local:
-	-$(RM) -rf "$(DESTDIR)$(pkgcachedir)"
+	-$(RM) -rf "$(DESTDIR)$(fc_cachedir)"
 
 INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(FREETYPE_CFLAGS)
 
diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am
index 1730641..91e5ad7 100644
--- a/fc-cat/Makefile.am
+++ b/fc-cat/Makefile.am
@@ -27,8 +27,6 @@ FC_CAT_SRC=${top_srcdir}/fc-cat
 
 SGML = ${FC_CAT_SRC}/fc-cat.sgml
 
-AM_CPPFLAGS = -DPKGCACHEDIR='"${pkgcachedir}"'
-
 INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS)
 
 bin_PROGRAMS=fc-cat