From 52b2b5c99268d5ad28dc0972c5f136720d55f21b Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Tue, 5 Feb 2013 20:44:18 +0900
Subject: [PATCH] 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
---
 Makefile.am | 3 ---
 1 file changed, 3 deletions(-)

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