[med-svn] r1922 - trunk/packages/imagej/trunk/debian

[tille at alioth.debian.org]

Author: tille
Date: 2008-05-28 06:53:58 +0000 (Wed, 28 May 2008)
New Revision: 1922

Modified:
   trunk/packages/imagej/trunk/debian/rules
Log:
Let compilation with gcj at least start, but there are 6 errors.  Any Java wizards???


Modified: trunk/packages/imagej/trunk/debian/rules
===================================================================
--- trunk/packages/imagej/trunk/debian/rules	2008-05-27 23:09:14 UTC (rev 1921)
+++ trunk/packages/imagej/trunk/debian/rules	2008-05-28 06:53:58 UTC (rev 1922)
@@ -9,7 +9,11 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 # JAVA_HOME		:= $(shell /usr/sbin/update-java-alternatives -l | head -1 | cut -d' ' -f 3)
-JAVA_HOME		:= $(shell /usr/sbin/update-java-alternatives -l | grep -vw sun | head -1 | cut -d' ' -f 3)
+# JAVA_HOME		:= $(shell /usr/sbin/update-java-alternatives -l | grep -vw sun | head -1 | cut -d' ' -f 3)
+# Use gcj as java home or search for other installed JVM
+JAVA_HOME = $(or $(shell [ -x /usr/lib/jvm/java-gcj ] && echo "/usr/lib/jvm/java-gcj"), $(shell ls -L /usr/lib/jvm/ | grep -v -e "[0-9]$" -e "-gcj$" | head -1 ))
+ANT = JAVA_HOME=$(JAVA_HOME) TEX4HTENV=/etc/tex4ht/tex4ht.env ant
+
 JAVACMD			:= $(JAVA_HOME)/bin/java
 DEB_BUILDDIR		:= $(CURDIR)
 DEB_ANT_BUILD_TARGET	:= build