bug#7647: [PATCH] {maint} Warnings about primary/prefix mismatch fixed and extended.

[Stefano Lattarini]

Reference:
 <http://lists.gnu.org/archive/html/automake-patches/2011-03/msg00053.html>

On Wednesday 30 March 2011, Stefano Lattarini wrote:
> References:
>  <http://lists.gnu.org/archive/html/automake-patches/2011-01/msg00304.html>
>  <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7647>
> 
> Ping^2?
> 
> I will push in 72 hours if there are no objections.
> 
> Regards,
>   Stefano
> 
I've just realized that the "adjusted" test java3.test has been made
weaker, since $(javadir) is empty by default and thus nothing gets
installed there anyway.  The following squash-in should solve this
issue:

-*-*-

diff --git a/ChangeLog b/ChangeLog
index 615a72d..0c54062 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2011-01-27  Stefano Lattarini  <address@hidden>
+2011-04-17  Stefano Lattarini  <address@hidden>
 
        Warnings about primary/prefix mismatch fixed and extended.
        * automake.in (%standard_prefix): Add `doc' and `locale'.
diff --git a/tests/java3.test b/tests/java3.test
index 41dbb71..e1850a8 100755
--- a/tests/java3.test
+++ b/tests/java3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2011 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure that Java rules don't attempt to install *.java files when
-# there are none.
+# Make sure that Java rules don't attempt to compile or install
+# *.java files when there are none.
 # Report from Johannes Nicolai (PR/441).
 
 . ./defs || Exit 1
@@ -32,10 +32,13 @@ if WHO_CARES
 JAVA_FILES = MyClass1.java
 endif
 
-dist_java_JAVA = $(JAVA_FILES)
+javadir = $(prefix)/java
+java_JAVA = $(JAVA_FILES)
 END
 
-: >MyClass1.java
+cat > MyClass1.java << 'END'
+class MyClass1 { // Deliberately missing right curly bracket.
+END
 
 $ACLOCAL
 $AUTOCONF
@@ -43,9 +46,10 @@ $AUTOMAKE
 
 cwd=`pwd` || Exit 1
 ./configure --prefix="$cwd/_inst"
+$MAKE
 $MAKE install
-test ! -d _inst
-test ! -r _inst
+ls -l . _inst/java # For debugging.
+find . -name '*.class' | grep . && Exit 1
 $MAKE uninstall
 $MAKE distcheck
 
-*-*-

I'll push in 72 hours if there is no review by then.

Regards,
  Stefano