From c2ec7e5cf9ee10c94c5d3df699538deed2524c35 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 14 May 1996 17:26:15 +0000
Subject: [PATCH] Fixed EXTRA_ problems

---
 ChangeLog        |  5 +++++
 automake.in      |  9 +++++----
 tests/ChangeLog  |  4 ++++
 tests/extra.test | 10 ++++++++--
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d92d7b1a..3d4a22ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 14 10:24:30 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+	* automake.in (am_install_var): Fixed problem in EXTRA_ handling.
+	Test extra.test.
+
 Mon May 13 10:41:41 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
 	* install-sh (transformbasename): Correct misspelling of
diff --git a/automake.in b/automake.in
index 62a32fd9..ecc01a6d 100755
--- a/automake.in
+++ b/automake.in
@@ -2644,8 +2644,6 @@ sub am_install_var
 	    }
 	}
     }
-    # We never want to examine EXTRA_blah.
-    delete $valid{'EXTRA'};
 
     local ($clean_file) = $file . '-clean';
     local ($one_name);
@@ -2665,6 +2663,10 @@ sub am_install_var
 		push (@result, $rcurs);
 	    }
 
+	    # "EXTRA" shouldn't be used when generating clean targets,
+	    # @all, or install targets.
+	    next if $X eq 'EXTRA';
+
 	    if ($do_clean)
 	    {
 		$output_rules .=
@@ -2685,8 +2687,7 @@ sub am_install_var
 	    }
 	    if ($X eq 'noinst' || $X eq 'check')
 	    {
-		# Objects in noinst_FOO or check_FOO never get
-		# installed.
+		# Objects which don't get installed by default.
 		next;
 	    }
 
diff --git a/tests/ChangeLog b/tests/ChangeLog
index cb5a809f..3e140ae9 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 14 10:17:17 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+	* extra.test: Reversed sense of test.
+
 Fri Apr 26 15:15:01 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
 	* instman.test: New file.
diff --git a/tests/extra.test b/tests/extra.test
index 014f1713..49bf5ac9 100755
--- a/tests/extra.test
+++ b/tests/extra.test
@@ -1,6 +1,9 @@
 #! /bin/sh
 
-# Test to make sure EXTRA_ targets are not generated.
+# Test to make sure EXTRA_ targets are generated.  This test used to
+# make sure the targets were *not* generated.  That is wrong; the
+# targets should always be generated.  However, they should not be
+# built by default.
 
 . $srcdir/defs || exit 1
 
@@ -11,5 +14,8 @@ END
 
 $AUTOMAKE || exit 1
 
-grep "^zardoz" Makefile.in && exit 1
+grep "^zardoz" Makefile.in || exit 1
+
+# Can't have EXTRA clean rules.
+grep 'clean.*EXTRA' Makefile.in && exit 1
 exit 0
-- 
2.43.5