* automake.in (am_install_var): Remove redundancies from the

	result.  Fixes test cond8.test.

diff --git a/ChangeLog b/ChangeLog
index 2da6e3c173c257ef61d02b50d4ca38f535dce49a..bf5b1e4b6858d75d36c36a01fe3a609b7828d895 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-04-10  Tom Tromey  <tromey@cygnus.com>
 
+       * automake.in (am_install_var): Remove redundancies from the
+       result.  Fixes test cond8.test.
+
        * automake.in (handle_single_transform_list): Handle dependency
        tracking when files are created in subdirs.  Error if object in
        subdir has `..' component.

diff --git a/automake.in b/automake.in
index 78295f3d155b78d161af2eb3fd6d6834233e380f..976677253414461d94d181129ae52709961728cd 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -7106,7 +7106,12 @@ sub am_install_var
     push (@all, '$(' . $primary . ')')
        if @used && $primary ne 'JAVA';
 
-    return (@result);
+    # Make the result unique.  This lets the user use conditionals in
+    # a natural way, but still lets us program lazily -- we don't have
+    # to worry about handling a particular object more than once.
+    local (%uniquify) = ();
+    grep ($uniquify{$_} = 1, @result);
+    return sort keys %uniquify;
 }