[latexdraw] 34/147: * also set JAVA_HOME for openjdk

[Stuart Prescott]

This is an automated email from the git hooks/post-receive script.

stuart pushed a commit to branch master
in repository latexdraw.

commit 91fc468cfb4ebd0005c80bc5ca1337713c422df9
Author: Stuart Prescott <stuart at debian.org>
Date:   Tue Jul 15 19:19:30 2008 +0000

    * also set JAVA_HOME for openjdk
---
 debian/rules | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 0a31f12..ec781e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,11 @@
 # Uncomment this to turn on verbose mode.
 # export DH_VERBOSE=1
 
-# Thanks to the tuxguitar maintainers for this bit of wizardry:
+# Work out a sensible value for JAVA_HOME so that ant is happy
 JAVA_HOME ?= $(shell echo \
-  `( t=/usr/lib/jvm/java-6-sun && test -d $$t && echo $$t ) \
+  ` \
+     ( t=/usr/lib/jvm/java-6-openjdk && test -d $$t && echo $$t )   \
+  || ( t=/usr/lib/jvm/java-6-sun     && test -d $$t && echo $$t )   \
   || ( t=/usr/lib/jvm/java-1.5.0-sun && test -d $$t && echo $$t )`  \
  )
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/latexdraw.git