CVS libjfreereport-java/debian

[Christian Bayle]

Update of /cvsroot/pkg-java/libjfreereport-java/debian
In directory haydn:/tmp/cvs-serv18768/libjfreereport-java/debian

Modified Files:
	changelog rules 
Log Message:
RELEASE_0_8_3c-5


--- /cvsroot/pkg-java/libjfreereport-java/debian/changelog	2005/04/28 21:07:03	1.4
+++ /cvsroot/pkg-java/libjfreereport-java/debian/changelog	2005/04/29 18:35:59	1.5
@@ -1,3 +1,10 @@
+libjfreereport-java (0.8.3c-5) unstable; urgency=high
+
+  * Recognize the JAVA_HOME directories for ibm-j2sdk1.4 and
+    blackdown-j2sdk1.4 (Closes: #306923)
+
+ -- Christian Bayle <bayle@debian.org>  Fri, 29 Apr 2005 20:33:22 +0200
+
 libjfreereport-java (0.8.3c-4) unstable; urgency=high
 
   * Transition to liblog4j1.2-java (Closes: #306754) 
--- /cvsroot/pkg-java/libjfreereport-java/debian/rules	2005/02/08 19:31:22	1.3
+++ /cvsroot/pkg-java/libjfreereport-java/debian/rules	2005/04/29 18:35:59	1.4
@@ -5,9 +5,8 @@
 
 # Build 
 # Choose the VM
-# Blackdown
-#export JAVA_HOME=/usr/lib/j2se/1.4
-export JAVA_HOME=/usr/lib/j2sdk1.4-sun
+JAVA_HOME_DIRS=/usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.4-blackdown
+export JAVA_HOME ?= $(shell for j in $(JAVA_HOME_DIRS); do [ -d "$$j" ] && echo $$j && exit 0; done)
 export JAVA=$(JAVA_HOME)/bin/java
 export JAVAC=$(JAVA_HOME)/bin/javac
 export CLASSPATH=$(JAVA_HOME)/jre/lib/rt.jar:.