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 038e40cab1e29889a7bc6a06978377823bc1eed8..2776e60c1a93af867741f09df24eb862af7166b6 100644 (file)
--- 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 6e6e438c2efbe460cc533aff8c47fa80e0eceeb5..b4ffd6357cb04e5d09642b1047d897e4190b0f50 100755 (executable)
--- 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'))