[Fontconfig] fontconfig: Branch 'master' - 2 commits

[Raimund Steger]

Behdad Esfahbod wrote:
> [...]
> diff --git a/src/Makefile.am b/src/Makefile.am
> index c32c6f3..d3ce428 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -108,7 +108,8 @@ fcobjshash.gperf: fcobjshash.gperf.h fcobjs.h
>   	/CUT_OUT_BEGIN/ { no_write=1; next; }; \
>   	/CUT_OUT_END/ { no_write=0; next; }; \
>   	{ if (!no_write) print; next; }; \
> -	' - > $@.tmp && \
> +	' - | \
> +	sed 's/^ *//;s/ *, */,/' > $@.tmp && \
>   	mv -f $@.tmp $@

If you'll allow some further nagging, the sed has to be earlier than the 
grep so that the latter has the chance to remove empty lines (Sun Studio 
CPP generates a line with a single blank for the comments in fcobjs.h)...

But then it should really work... :-)

Raimund

-- 
Worringer Str 31 Duesseldorf 40211 DE  home: <rs at mytum.de>
+49-179-2981632 icq 16845346           work: <rs at interface-ag.de>