diff options
Diffstat (limited to 'odk/settings/std.mk')
| -rw-r--r-- | odk/settings/std.mk | 8 |
1 files changed, 4 insertions, 4 deletions
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 |