* automake.in (handle_dist_worker): Always define DIST_SUBDIRS.

	Re-fixes pr87.test.

diff --git a/ChangeLog b/ChangeLog
index a8d71d1be0ee0f06dc062ab6dea8ca9d50fb23bf..c3740a57f3f3388d957c51c46d70a6ba7f9f7bd3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-12-23  Tom Tromey  <tromey@redhat.com>
 
+       * automake.in (handle_dist_worker): Always define DIST_SUBDIRS.
+       Re-fixes pr87.test.
+
        * subdirs.am (maintainer-clean-recursive): Use DIST_SUBDIRS for
        distclean and maintainer-clean.
        * automake.texi (Top level): Document use of DIST_SUBDIRS.

diff --git a/automake.in b/automake.in
index e7f267ef7e1a83ca0663ad0687d59987d06d042a..533418cc699b3a7c0423d83ef843558df523507b 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2722,6 +2722,9 @@ sub handle_dist_worker
        else
        {
            $dist_subdir_name = 'SUBDIRS';
+           # We always define this because that is what `distclean'
+           # wants.
+           &define_pretty_variable ('DIST_SUBDIRS', '', '$(SUBDIRS)');
        }
 
        # Test for directory existence here because previous automake