Author: Andreas Tille <tille@debian.org>
Last-Update: Thu, 14 Sep 2017 18:58:23 +0200
Bug-Debian: https://bugs.debian.org/875779
Description: Work around OSX specific way to set JAVA_HOME and remove bootclasspath
Forwarded: not-needed

--- a/Makefile.common.mk
+++ b/Makefile.common.mk
@@ -10,14 +10,14 @@ PATHTOTESTRESULTSFROMROOT = ./testresult
 
 JAVAVERSIONTARGET=1.7
 
-JAVACTARGETOPTIONS=-target ${JAVAVERSIONTARGET} -source ${JAVAVERSIONTARGET} -bootclasspath $${JAVAVERSIONTARGETJARFILE}
+JAVACTARGETOPTIONS=-target ${JAVAVERSIONTARGET} -source ${JAVAVERSIONTARGET}
 
 .SUFFIXES:	.class .java .ico .png
 
 JAVACOPTIONS = -O ${JAVACTARGETOPTIONS} -encoding "UTF8" -Xlint:deprecation
 
 .java.class:
-	export JAVAVERSIONTARGETJARFILE=`/usr/libexec/java_home -v ${JAVAVERSIONTARGET} | tail -1`/jre/lib/rt.jar; javac ${JAVACOPTIONS} \
+	export JAVAVERSIONTARGETJARFILE=${JAVA_HOME}/jre/lib/rt.jar; javac ${JAVACOPTIONS} \
 		-classpath ${PATHTOROOT} \
 		-sourcepath ${PATHTOROOT} $<