[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 Makefile.am |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 52b2b5c99268d5ad28dc0972c5f136720d55f21b
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Feb 5 20:44:18 2013 +0900

    Bug 60312 - DIST_SUBDIRS should never appear in a conditional
    
    As it is documented like this:
    
    If SUBDIRS is defined conditionally using Automake conditionals,
    Automake will define DIST_SUBDIRS automatically from the possible
    values of SUBDIRS in all conditions.
    
    So we don't need to re-define DIST_SUBDIRS in Makefile.am unless
    we use AC_SUBST to define SUBDIRS.
    
    Patch from Quentin Glidic

diff --git a/Makefile.am b/Makefile.am
index 558b695..22f2354 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,9 +26,6 @@ SUBDIRS=fontconfig fc-case fc-lang fc-glyphname src \
 	fc-validate conf.d test
 if ENABLE_DOCS
 SUBDIRS += doc
-DIST_SUBDIRS = $(SUBDIRS)
-else
-DIST_SUBDIRS = $(SUBDIRS) doc
 endif
 
 AUTOMAKE_OPTIONS = dist-bzip2