Some bugs from François Pinard:

	* automake.in (usage): Remove duplicates in file list.

diff --git a/ChangeLog b/ChangeLog
index 37b573516014052215d6886bbcdbf0d85d7f72cd..25bb7a2bc724c72f8a94a8be8814383f27c08ff7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1998-12-02  Tom Tromey  <tromey@cygnus.com>
 
+       Some bugs from François Pinard:
+       * automake.in (usage): Remove duplicates in file list.
+
        * automake.in (usage): Print files in column-major order.
        (handle_gettext): Only require ABOUT-NLS for GNU programs.
 

diff --git a/automake.in b/automake.in
index ddcc828c7293c37ab9badd882cecb91ee949f1d3..d0d42350a534431177a077ab6083442d151cab34 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -7062,9 +7062,15 @@ sub usage
     print $USAGE;
     print "\nFiles which are automatically distributed, if found:\n";
     $~ = "USAGE_FORMAT";
-    local (@lcomm) = sort ((@common_files, @common_sometimes));
-    local ($one, $two, $three, $four, $i, $max);
+    local ($last, $iter, @lcomm);
+    $last = '';
+    foreach $iter (sort ((@common_files, @common_sometimes)))
+    {
+       push (@lcomm, $iter) unless $iter eq $last;
+       $last = $iter;
+    }
 
+    local ($one, $two, $three, $four, $i, $max);
     $max = int (($#lcomm + 1) / 4);
 
     for ($i = 0; $i < $max; ++$i)