From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 18 Aug 2011 19:34:44 +0000 (+0200)
Subject: Merge branch 'maint' into java-work
X-Git-Tag: ng-0.5a~123^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=036767871101be12266ca04f9efe1957727744de;p=thirdparty%2Fautomake.git

Merge branch 'maint' into java-work
---

036767871101be12266ca04f9efe1957727744de
diff --cc lib/am/java.am
index e0f5bba25,604df2229..464b70609
--- a/lib/am/java.am
+++ b/lib/am/java.am
@@@ -20,13 -20,11 +20,13 @@@
  ## Building.  ##
  ## ---------- ##
  
 +if %?FIRST%
  JAVAC = javac
- CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT):$$CLASSPATH
+ CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT)$${CLASSPATH:+":$$CLASSPATH"}
  JAVAROOT = $(top_builddir)
 +endif %?FIRST%
  
 -class%DIR%.stamp: $(%DIR%_JAVA)
 +class%NDIR%.stamp: $(am__java_sources)
  	@list1='$?'; list2=; if test -n "$$list1"; then \
  	  for p in $$list1; do \
  	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \