FYI: always use DIST_SUBDIRS

[Alexandre Duret-Lutz]

distdir used it use SUBDIRS when DIST_SUBDIRS was not user-defined.
However since Automake now always defines DIST_SUBDIRS, there is no
reason not to use DIST_SUBDIRS.  On the contrary, using SUBDIRS confuse
people into thinking DIST_SUBDIRS is not used by distdir.

2004-07-17  Alexandre Duret-Lutz  <address@hidden>

        * lib/am/distdir.am (distdir): Always use $(DIST_SUBDIRS) now
        that it is always defined.  This is less confusing for users
        reading the generated Makefiles.
        * automake.in (handle_dist): Do not substitute DIST_SUBDIR_NAME.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1565
diff -u -r1.1565 automake.in
--- automake.in 14 Jul 2004 14:49:07 -0000      1.1565
+++ automake.in 17 Jul 2004 10:46:07 -0000
@@ -3416,7 +3416,7 @@
       # If SUBDIRS is conditionally defined, then set DIST_SUBDIRS
       # to all possible directories, and use it.  If DIST_SUBDIRS is
       # defined, just use it.
-      my $dist_subdir_name;
+
       # Note that we check DIST_SUBDIRS first on purpose, so that
       # we don't call has_conditional_contents for now reason.
       # (In the past one project used so many conditional subdirectories
@@ -3426,25 +3426,20 @@
       # but it's more efficient to avoid the call anyway.)
       if (var ('DIST_SUBDIRS'))
        {
-         $dist_subdir_name = 'DIST_SUBDIRS';
        }
       elsif ($subdirs->has_conditional_contents)
        {
-         $dist_subdir_name = 'DIST_SUBDIRS';
          define_pretty_variable
            ('DIST_SUBDIRS', TRUE, INTERNAL,
             uniq ($subdirs->value_as_list_recursive));
        }
       else
        {
-         $dist_subdir_name = 'SUBDIRS';
          # We always define this because that is what `distclean'
          # wants.
          define_pretty_variable ('DIST_SUBDIRS', TRUE, INTERNAL,
                                  '$(SUBDIRS)');
        }
-
-      $transform{'DIST_SUBDIR_NAME'} = $dist_subdir_name;
     }
 
   # The remaining definitions are only required when a dist target is used.
Index: lib/am/distdir.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/distdir.am,v
retrieving revision 1.59
diff -u -r1.59 distdir.am
--- lib/am/distdir.am   22 May 2004 07:19:36 -0000      1.59
+++ lib/am/distdir.am   17 Jul 2004 10:46:07 -0000
@@ -164,7 +164,7 @@
 ## us work correctly with an enclosing package.
 ##
 if %?SUBDIRS%
-       list='$(%DIST_SUBDIR_NAME%)'; for subdir in $$list; do \
+       list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
          if test "$$subdir" = .; then :; else \
            test -d "$(distdir)/$$subdir" \
            || $(mkdir_p) "$(distdir)/$$subdir" \

-- 
Alexandre Duret-Lutz