* lib/am/java.am (class%DIR%.stamp): Do not assume `$?' has

the path of the prerequisite added; IRIX 6.5 make does not add
it, Solaris 2.6 make is inconsistent about adding it.  Fixes
java.test failure.

diff --git a/ChangeLog b/ChangeLog
index aa5f690581874801e46ecce590de423c8bdc42ba..e687a8b6a5a3c0065f0b2fe00ecee832f856c975 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-05-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       * lib/am/java.am (class%DIR%.stamp): Do not assume `$?' has
+       the path of the prerequisite added; IRIX 6.5 make does not add
+       it, Solaris 2.6 make is inconsistent about adding it.  Fixes
+       java.test failure.
+
        * tests/distdir.test: Do not use leading `./' in EXTRA_DIST for
        files in the source tree.  Fixes failures with HP-UX and Tru64
        make.

diff --git a/lib/am/java.am b/lib/am/java.am
index 12c691f4fa7010d2f6bf0940abe1054956908145..8471eecb5456764c789021e6b7d0a5f85e2cdc7c 100644 (file)
--- a/lib/am/java.am
+++ b/lib/am/java.am
@@ -26,10 +26,13 @@ CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT):$$CLASSPATH
 JAVAROOT = $(top_builddir)
 
 class%DIR%.stamp: $(%DIR%_JAVA)
-       @if test -n "$?"; then \
-         echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \
-         $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \
-           $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \
+       @list1='$?'; list2=; if test -n "$$list1"; then \
+         for p in $$list1; do \
+           if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+           list2="$$list2 $$d$$p"; \
+         done; \
+         echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) '"$$list2"; \
+         $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $$list2; \
        else :; fi
        echo timestamp > class%DIR%.stamp