From: Tom Tromey <tromey@redhat.com>
Date: Sat, 5 May 2001 21:06:46 +0000 (+0000)
Subject: 2001-05-05  Richard Boulton  <richard@tartarus.org>
X-Git-Tag: handle-languages~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ff51628212485724b465efcb108ca40d11b9013;p=thirdparty%2Fautomake.git

2001-05-05  Richard Boulton  <richard@tartarus.org>

	* automake.in (handle_dist): Check for existence of DIST_SUBDIRS
	first.
---

diff --git a/ChangeLog b/ChangeLog
index 038e40cab..2776e60c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-05  Richard Boulton  <richard@tartarus.org>
+
+	* automake.in (handle_dist): Check for existence of DIST_SUBDIRS
+	first.
+
 2001-05-05  Robert Collins  <robert.collins@itdomain.com.au>
 
 	* automake.in (required_targets): Added uninstall-am.
diff --git a/automake.in b/automake.in
index 6e6e438c2..b4ffd6357 100755
--- a/automake.in
+++ b/automake.in
@@ -3084,8 +3084,12 @@ sub handle_dist
 	# to all possible directories, and use it.  If DIST_SUBDIRS is
 	# defined, just use it.
 	my $dist_subdir_name;
-	if (variable_conditionally_defined ('SUBDIRS')
-	    || &variable_defined ('DIST_SUBDIRS'))
+	# Note that we check DIST_SUBDIRS first on purpose.  At least
+	# one project uses so many conditional subdirectories that
+	# calling variable_conditionally_defined on SUBDIRS will cause
+	# automake to grow to 150Mb.  Sigh.
+	if (&variable_defined ('DIST_SUBDIRS')
+	    || variable_conditionally_defined ('SUBDIRS'))
 	{
 	    $dist_subdir_name = 'DIST_SUBDIRS';
 	    if (! &variable_defined ('DIST_SUBDIRS'))