[PATCH bh-ttf] Use XORG_FONT_FC_CONFDIR from font-util 1.2 to find fontconfig's confdir

Gaetan Nadon memsize at videotron.ca
Thu Oct 7 07:54:58 PDT 2010


On Wed, 2010-10-06 at 17:14 -0700, Jeremy Huddleston wrote:

> Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
> ---
>  Makefile.am  |    2 +-
>  configure.ac |    7 ++++---
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 34d9819..f1fc0cc 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -36,7 +36,7 @@ FONT_FILES = \
>  fontdir = @FONTDIR@
>  font_DATA = $(FONT_FILES)
>  
> -fontconfigdir = $(sysconfdir)/fonts
> +fontconfigdir = @FC_CONFDIR@
>  actualconfigdir = $(fontconfigdir)/conf.d
>  availconfigdir = $(fontconfigdir)/conf.avail
>  dist_availconfig_DATA = 42-luxi-mono.conf
> 


Reviewed-by: Gaetan Nadon <memsize at videotron.ca>

Just a nit, it could be simplified:

        actualconfigdir = $(FC_CONFDIR)/conf.d
        availconfigdir = $(FC_CONFDIR)/conf.avail

There is no need to define a variable with the "dir" suffix as something
like fontconfig_DATA is not used. It's nice to keep the variables with
dir suffix
for those who participate in the Automake "uniform naming scheme".


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20101007/16a4b4ee/attachment.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg-devel/attachments/20101007/16a4b4ee/attachment.pgp>


More information about the xorg-devel mailing list