[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

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

New commits:
commit 2c93614ea0d0d1d895abe6c44add436c58bd99f8
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Feb 25 15:10:41 2010 -0500

    Bug 18886 installation crashes if fontconfig already installed
    
    Run the uninstalled fc-cache, not the installed one.

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