[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a1efb5ea8c76622c7587cb5362e821bff8dcd7c4
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Aug 1 08:10:35 2018 +0000

    Fix the build issue with gperf
    
    GPerf seems not allowing the empty lines though, current recipes are supposed to drop them.
    but seems not working on some env.
    So taking the proper way to do that instead of incompatible things against platforms.

diff --git a/src/Makefile.am b/src/Makefile.am
index 7a35575..7b414df 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -111,10 +111,10 @@ fcobjshash.gperf: Makefile stamp-fcobjshash.gperf
 stamp-fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h
 	$(AM_V_GEN) $(CPP) -I$(top_srcdir) $(CPPFLAGS) $< | \
 	$(SED) 's/^ *//;s/ *, */,/' | \
-	$(GREP) '^[^#]' | \
 	awk ' \
 		/CUT_OUT_BEGIN/ { no_write=1; next; }; \
 		/CUT_OUT_END/ { no_write=0; next; }; \
+		/^$$/||/^#/ { next; }; \
 		{ if (!no_write) print; next; }; \
 	' - > $@.tmp && \
 	mv -f $@.tmp fcobjshash.gperf && touch $@ || ( $(RM) $@.tmp && false )