[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

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

New commits:
commit fd5667b42c253da9c4c5502f53b5c0fb7e0f589e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jul 23 11:57:31 2014 -0400

    Symlinks fix for DESTDIR
    
    From:
    https://github.com/Alexpux/MINGW-packages/blob/master/mingw-w64-fontconfig/fontconfig-2.11.0-symlinks-fix.patch

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index d61756b..2b2c85f 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -88,9 +88,9 @@ install-data-hook:
 	@(echo cd $(DESTDIR)$(configdir);			\
 	  cd $(DESTDIR)$(configdir);				\
 	  for i in $(CONF_LINKS); do				\
-	    echo $(RM) $$i";" ln -s $(templatedir)/$$i .;	\
+	    echo $(RM) $$i";" ln -s $(DESTDIR)$(templatedir)/$$i .;\
 	    $(RM) $$i;						\
-	    ln -s $(templatedir)/$$i .;				\
+	    ln -s $(DESTDIR)$(templatedir)/$$i .;		\
 	  done)
 uninstall-local:
 	@(echo cd $(DESTDIR)$(configdir);			\