From c56067506291d57ba6bf14cc176b55d74614ec41 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Thu, 11 May 2006 17:25:41 +0000 Subject: [PATCH] * 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. --- ChangeLog | 5 +++++ lib/am/java.am | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa5f6905..e687a8b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-05-11 Ralf Wildenhues + * 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 12c691f4..8471eecb 100644 --- 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 -- 2.43.5