From c306c444bfd3d0984741fd99ed4f29016ef14ee2 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 1 Feb 2017 14:53:19 +0100
Subject: Also on macOS use JDK's .../Home/bin/javac etc.

Only on macOS, the SDK used to expect javac etc. in a Commands sub-dir (which
Apple's JDK 1.6.0 has but Oracle's JDK 1.8.x don't).  However, at least both
Apple's latest JDK 1.6.0 (as available via <https://support.apple.com/kb/DL1572>
"Download Java for OS X 2015-001") and any recent Oracle JDK 1.8.x (like
jdk1.8.0_121.jdk) have a Home sub-dir that contains a "standard" sub-tree with
bin sub-dir etc., like on other platforms.  So consistently make the SDK use
that instead.

This removes the JAVABIN Make variable from settings.mk.  It is assumed to not
be used by client code.

Change-Id: Ie0ad647f489528444dfd399c2f00500b772d3288
---
 odk/settings/std.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'odk/settings/std.mk')

diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index e69fc3ec4803..dfa01e66fa82 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -61,7 +61,7 @@ OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"
 
 JAVA_OPTIONS=
 ifneq "$(OO_SDK_JAVA_HOME)" ""
-JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/$(JAVABIN)/java -version 2>&1 | tail -1 | cut -d " " -f3)
+JAVA_BITS := $(shell $(OO_SDK_JAVA_HOME)/bin/java -version 2>&1 | tail -1 | cut -d " " -f3)
 ifeq "$(JAVA_BITS)" "64-Bit"
 ifneq "$(PROCTYPE)" "x86_64"
 JAVA_OPTIONS=-d32
@@ -70,9 +70,9 @@ endif
 endif
 
 DEPLOYTOOL="$(OFFICE_PROGRAM_PATH)$(PS)unopkg" add -f
-SDK_JAVA="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/java" $(JAVA_OPTIONS)
-SDK_JAVAC="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/javac"
-SDK_JAR="$(OO_SDK_JAVA_HOME)/$(JAVABIN)/jar"
+SDK_JAVA="$(OO_SDK_JAVA_HOME)/bin/java" $(JAVA_OPTIONS)
+SDK_JAVAC="$(OO_SDK_JAVA_HOME)/bin/javac"
+SDK_JAR="$(OO_SDK_JAVA_HOME)/bin/jar"
 ifneq "$(OO_SDK_ZIP_HOME)" ""
 SDK_ZIP="$(OO_SDK_ZIP_HOME)/zip"
 else
-- 
cgit