[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 fc-case/Makefile.am      |    2 +-
 fc-glyphname/Makefile.am |    2 +-
 fc-lang/Makefile.am      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit faea1cac85ac3b0fd6a983e1c0adeb68e115e06c
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Wed Nov 28 16:10:28 2012 +0000

    Fix build when srcdir != builddir
    
    When ./configure'd in a directory other than the srcdir, we need to look
    in ${top_builddir)/src for the generated header fcstdint.h
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/fc-case/Makefile.am b/fc-case/Makefile.am
index ad5dc74..6914824 100644
--- a/fc-case/Makefile.am
+++ b/fc-case/Makefile.am
@@ -23,7 +23,7 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #
 
-INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
+INCLUDES=-I${top_builddir}/src -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
 
 TMPL=fccase.tmpl.h
 STMPL=${top_srcdir}/fc-case/${TMPL}
diff --git a/fc-glyphname/Makefile.am b/fc-glyphname/Makefile.am
index 697b5c3..fdba146 100644
--- a/fc-glyphname/Makefile.am
+++ b/fc-glyphname/Makefile.am
@@ -23,7 +23,7 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #
 
-INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
+INCLUDES=-I${top_builddir}/src -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
 
 TMPL=fcglyphname.tmpl.h
 STMPL=${top_srcdir}/fc-glyphname/${TMPL}
diff --git a/fc-lang/Makefile.am b/fc-lang/Makefile.am
index d2eca5b..5c2d1bf 100644
--- a/fc-lang/Makefile.am
+++ b/fc-lang/Makefile.am
@@ -23,7 +23,7 @@
 # PERFORMANCE OF THIS SOFTWARE.
 #
 
-INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
+INCLUDES=-I${top_builddir}/src -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS)
 
 TMPL=fclang.tmpl.h
 STMPL=${top_srcdir}/fc-lang/fclang.tmpl.h