From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sun, 22 Aug 2010 18:13:41 +0000 (+0100)
Subject: Do not use openjdk; it doesn't work to mix and match
X-Git-Tag: 0.9.1~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=jarrg-ian.git;a=commitdiff_plain;h=2f9d258269d321a48fc20919811bf944cc099248

Do not use openjdk; it doesn't work to mix and match
---

diff --git a/jpctb b/jpctb
index c7bfe4b..c5bf4aa 100755
--- a/jpctb
+++ b/jpctb
@@ -114,13 +114,6 @@ END
 	fi
 fi
 
-openjdk=/usr/lib/jvm/java-6-openjdk
-
-if [ "x$javadir" = x ] && [ -x $openjdk/bin/java ]; then
-	echo "   using openjdk, hopefully it will work with YPP!"
-	javadir=$openjdk
-fi
-
 if [ "x$javadir" = x ]; then
 	fail "could not find java runtime system
  please check that $yppdir/java points to your Java installation"