diff -ruN fontconfig-2.5.0.orig/fc-arch/Makefile.am fontconfig-2.5.0/fc-arch/Makefile.am --- fontconfig-2.5.0.orig/fc-arch/Makefile.am 2007-10-25 04:39:14.000000000 +0000 +++ fontconfig-2.5.0/fc-arch/Makefile.am 2007-12-22 20:48:08.000000000 +0000 @@ -26,7 +26,7 @@ EXEEXT = @EXEEXT_FOR_BUILD@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) +INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) TMPL=fcarch.tmpl.h STMPL=${top_srcdir}/fc-arch/fcarch.tmpl.h diff -ruN fontconfig-2.5.0.orig/fc-case/Makefile.am fontconfig-2.5.0/fc-case/Makefile.am --- fontconfig-2.5.0.orig/fc-case/Makefile.am 2007-10-25 04:42:36.000000000 +0000 +++ fontconfig-2.5.0/fc-case/Makefile.am 2007-12-22 20:48:08.000000000 +0000 @@ -26,7 +26,7 @@ EXEEXT = @EXEEXT_FOR_BUILD@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) +INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) TMPL=fccase.tmpl.h STMPL=${top_srcdir}/fc-case/${TMPL} diff -ruN fontconfig-2.5.0.orig/fc-glyphname/Makefile.am fontconfig-2.5.0/fc-glyphname/Makefile.am --- fontconfig-2.5.0.orig/fc-glyphname/Makefile.am 2007-10-25 04:40:17.000000000 +0000 +++ fontconfig-2.5.0/fc-glyphname/Makefile.am 2007-12-22 20:48:08.000000000 +0000 @@ -26,7 +26,7 @@ EXEEXT = @EXEEXT_FOR_BUILD@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) +INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) TMPL=fcglyphname.tmpl.h STMPL=${top_srcdir}/fc-glyphname/${TMPL} diff -ruN fontconfig-2.5.0.orig/fc-lang/Makefile.am fontconfig-2.5.0/fc-lang/Makefile.am --- fontconfig-2.5.0.orig/fc-lang/Makefile.am 2007-10-25 04:40:39.000000000 +0000 +++ fontconfig-2.5.0/fc-lang/Makefile.am 2007-12-22 20:48:08.000000000 +0000 @@ -26,7 +26,7 @@ EXEEXT = @EXEEXT_FOR_BUILD@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) +INCLUDES=-I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) TMPL=fclang.tmpl.h STMPL=${top_srcdir}/fc-lang/fclang.tmpl.h