[Fontconfig] fontconfig: Branch 'master'

[Keith Packard]

 Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c6228a34b0ebaab3df395163b3b9246da2aa7d8c
Author: Glen Low <glen.low at pixelglow.com>
Date:   Sat May 24 15:59:35 2008 -0700

    Fix Win32 build error: install tries to run fc-cache locally (bug 15928).
    
    When building in Win32 e.g. with MinGW, the install tries to run fc-cache
    locally but the required DLL's are not in the path. I've included a patch for
    this to fix Makefile.in to run fc-cache from bindir but obviously this should
    be applied to Makefile.am instead.
    
    (the second part of this patch was already in the tree)

diff --git a/Makefile.am b/Makefile.am
index 9cd177d..b9c0321 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,8 +95,8 @@ install-data-local:
 	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
 	fi; fi
 	@(if $(RUN_FC_CACHE_TEST); then \
-	    echo " fc-cache/fc-cache -s -f -v"; \
-	    fc-cache/fc-cache -s -f -v; \
+	    echo " $(bindir)/fc-cache/fc-cache -s -f -v"; \
+	    $(bindir)/fc-cache/fc-cache -s -f -v; \
 	else \
 	    echo "***"; \
 	    echo "*** Warning: fonts.cache not built"; \