summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira TAGOH <akira@tagoh.org>2013-02-05 20:44:18 +0900
committerAkira TAGOH <akira@tagoh.org>2013-02-05 20:45:14 +0900
commit52b2b5c99268d5ad28dc0972c5f136720d55f21b (patch)
tree0c01eb45a1c91d41feaa1dd4e1d7a1ec188a5dba
parent95af7447dba7c54ed162b667c0bb2ea6500e8f32 (diff)
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
-rw-r--r--Makefile.am3
1 files changed, 0 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 558b695b..22f23546 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