>>> "RW" == Ralf Wildenhues <[EMAIL PROTECTED]> writes:
[...] RW> So, now I have two patches here: a hacky but efficient one that fixes RW> things for Solaris only, or a longer one that manually adds $(srcdir) RW> if deemed necessary. I say let's go with the second one, we already do that for elisp files and maybe others. RW> * lib/am/java.am (class%DIR%.stamp): Do not assume `$?' has RW> the path of the prerequisite added; IRIX 6.5 make does not add RW> it, Solaris 2.6 make is inconsistent about adding it. Fixes RW> java.test failure. RW> Index: lib/am/java.am RW> =================================================================== RW> RCS file: /cvs/automake/automake/lib/am/java.am,v RW> retrieving revision 1.24 RW> diff -u -r1.24 java.am RW> --- lib/am/java.am 14 May 2005 20:28:53 -0000 1.24 RW> +++ lib/am/java.am 2 May 2006 19:51:29 -0000 RW> @@ -26,10 +26,13 @@ RW> JAVAROOT = $(top_builddir) RW> class%DIR%.stamp: $(%DIR%_JAVA) RW> - @if test -n "$?"; then \ RW> - echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $?' ; \ RW> - $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) \ RW> - $(AM_JAVACFLAGS) $(JAVACFLAGS) $?; \ RW> + @list1='$?'; list2=; if test -n "$$list1"; then \ RW> + for p in $$list1; do \ RW> + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ RW> + list2="$$list2 $$d$$p"; \ RW> + done; \ RW> + echo '$(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) '"$$list2"; \ RW> + $(CLASSPATH_ENV) $(JAVAC) -d $(JAVAROOT) $(AM_JAVACFLAGS) $(JAVACFLAGS) $$list2; \ RW> else :; fi RW> echo timestamp > class%DIR%.stamp -- Alexandre Duret-Lutz Shared books are happy books. http://www.bookcrossing.com/friend/gadl
