* automake.in (handle_dist_worker): Remove redundant entries from

	DIST_SUBDIRS.

diff --git a/ChangeLog b/ChangeLog
index 510281b48e4ec0e7b27d08b797e55c018acefe7d..d1ef30fdfd52c8b5b397f2399d4ab44ab86c0d45 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-06-19  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (handle_dist_worker): Remove redundant entries from
+       DIST_SUBDIRS.
+
        * automake.in (handle_lib_objects_cond): Better error message when
        unrecognized option passed in LDADD.
 

diff --git a/automake.in b/automake.in
index a6dad577a2d2862f8797d952bfc553f1bec4585a..36a0cc65fdfb65fe5d33987ecdf4517b82785c64 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2720,9 +2720,18 @@ sub handle_dist_worker
            $dist_subdir_name = 'DIST_SUBDIRS';
            if (! &variable_defined ('DIST_SUBDIRS'))
            {
-               &define_pretty_variable ('DIST_SUBDIRS', '',
-                                        &variable_value_as_list ('SUBDIRS',
-                                                                 'all'));
+               local (@full_list) = &variable_value_as_list ('SUBDIRS',
+                                                             'all');
+               local (@ds_list, %uniq, $iter);
+               foreach $iter (@full_list)
+               {
+                   if (! defined $uniq{$iter})
+                   {
+                       $uniq{$iter} = 1;
+                       push (@ds_list, $iter);
+                   }
+               }
+               &define_pretty_variable ('DIST_SUBDIRS', '', @ds_list);
            }
        }
        else