[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

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

New commits:
commit a5641cfb2472a92a64858d00525ae3b0fc0ae2a4
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jul 23 13:21:05 2014 -0400

    Revert "Symlinks fix for DESTDIR"
    
    This reverts commit fd5667b42c253da9c4c5502f53b5c0fb7e0f589e.
    
    This was wrong, as pointed out by Akira on the list.
    We want symlinks to final destination.

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index 2b2c85f..d61756b 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 $(DESTDIR)$(templatedir)/$$i .;\
+	    echo $(RM) $$i";" ln -s $(templatedir)/$$i .;	\
 	    $(RM) $$i;						\
-	    ln -s $(DESTDIR)$(templatedir)/$$i .;		\
+	    ln -s $(templatedir)/$$i .;				\
 	  done)
 uninstall-local:
 	@(echo cd $(DESTDIR)$(configdir);			\