From: Tom Tromey <tromey@redhat.com>
Date: Sat, 23 Dec 2000 20:11:56 +0000 (+0000)
Subject: 	From Rusty Ballinger:
X-Git-Tag: Release-1-4b~4
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=1e9dbef19bcbf9d441a8bdc32675cfa0e7e516af;p=automake.git

	From Rusty Ballinger:
	* automake.in (handle_java): Don't skip `noinst' prefix.
---

diff --git a/ChangeLog b/ChangeLog
index 5e1c44a5..653c86e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-12-23  Tom Tromey  <tromey@redhat.com>
 
+	From Rusty Ballinger:
+	* automake.in (handle_java): Don't skip `noinst' prefix.
+
 	* automake.texi (Invoking aclocal): Mention ## comments.
 
 2000-12-22  Tom Tromey  <tromey@redhat.com>
diff --git a/THANKS b/THANKS
index 33204736..a0804e31 100644
--- a/THANKS
+++ b/THANKS
@@ -24,6 +24,7 @@ danbp			danpb@nospam.postmaster.co.uk
 Dave Morrison		dave@bnl.gov
 David A. Swierczek	swiercze@mr.med.ge.com
 David Zaroski		cz253@cleveland.Freenet.Edu
+Derek R. Price		derek.price@openavenue.com
 Dieter Baron		dillo@stieltjes.smc.univie.ac.at
 Doug Evans		devans@cygnus.com
 Eleftherios Gkioulekas	lf@amath.washington.edu
@@ -112,6 +113,7 @@ Ram
 Rich Wales		richw@webcom.com
 Rob Savoye		rob@cygnus.com
 Robert Bihlmeyer	robbe@orcus.priv.at
+Rusty Ballinger		rusty@rlyeh.engr.sgi.com
 Seth Alves		alves@hungry.com
 Shuhei Amakawa		<sa264@cam.ac.uk>
 Steve M. Robbins	steve@nyongwa.montreal.qc.ca
diff --git a/automake.in b/automake.in
index 51034f85..e7f267ef 100755
--- a/automake.in
+++ b/automake.in
@@ -4270,8 +4270,7 @@ sub handle_java
     local ($dir, $curs);
     foreach $curs (keys %valid)
     {
-	if (! &variable_defined ($curs . '_JAVA') || $curs eq 'noinst'
-	    || $curs eq 'EXTRA')
+	if (! &variable_defined ($curs . '_JAVA') || $curs eq 'EXTRA')
 	{
 	    next;
 	}