From: Tom Tromey <tromey@redhat.com>
Date: Sat, 10 Apr 1999 22:22:01 +0000 (+0000)
Subject: 	* automake.in (am_install_var): Remove redundancies from the
X-Git-Tag: last-merge-into-user-dep-gen-branch~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6568b5feaacb99cabd542e8b132cba01588d82d0;p=thirdparty%2Fautomake.git

	* automake.in (am_install_var): Remove redundancies from the
	result.  Fixes test cond8.test.
---

diff --git a/ChangeLog b/ChangeLog
index 2da6e3c17..bf5b1e4b6 100644
--- 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 78295f3d1..976677253 100755
--- 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;
 }