[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 doc/Makefile.am |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5d8ee5231ab1ea6f36d3103b4de24712c3ae2f64
Author: Helmut Grohne <helmut at subdivi.de>
Date:   Tue Jun 27 11:06:14 2017 +0200

    fix cross compilation
    
    Even though fontconfig's build system tries to build edit-sgml with the
    build arch compiler, it gets the runes wrong and actually builds it with
    the host arch compiler. This patch makes it use the right compiler.
    
    Bug-Debian: https://bugs.debian.org/779461
    https://bugs.freedesktop.org/show_bug.cgi?id=101554

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 670aa54..2194ab7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -123,7 +123,10 @@ noinst_PROGRAMS =	\
 edit_sgml_SOURCES =	\
 	edit-sgml.c	\
 	$(NULL)
-edit_sgml_CC := $(CC_FOR_BUILD)
+$(edit_sgml_OBJECTS) : CC:=$(CC_FOR_BUILD)
+$(edit_sgml_OBJECTS) : CFLAGS:=$(CFLAGS_FOR_BUILD)
+$(edit_sgml_OBJECTS) : CPPFLAGS:=$(CPPFLAGS_FOR_BUILD)
+edit_sgml_LINK = $(CC_FOR_BUILD) -o $@
 #
 check_SCRIPTS =			\
 	check-missing-doc	\