odk/settings/std.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) New commits: commit 2e244d879126f681488a99b0eb86c3ec2c2170f8 Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Jan 31 13:47:23 2017 +0100
Allow some OO_SDK_*_HOME to be empty ...in which case the corresponding tool is located on the PATH Change-Id: I4242180fbbc829f11aa1a12cf1e6b9f0a21ab7c6 diff --git a/odk/settings/std.mk b/odk/settings/std.mk index ac2d4aa..e69fc3e 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -73,9 +73,21 @@ 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" +ifneq "$(OO_SDK_ZIP_HOME)" "" SDK_ZIP="$(OO_SDK_ZIP_HOME)/zip" +else +SDK_ZIP=zip +endif +ifneq "$(OO_SDK_CAT_HOME)" "" SDK_CAT="$(OO_SDK_CAT_HOME)/cat" +else +SDK_CAT=cat +endif +ifneq "$(OO_SDK_SED_HOME)" "" SDK_SED="$(OO_SDK_SED_HOME)/sed" +else +SDK_SED=sed +endif IDLC="$(OO_SDK_HOME)/bin/idlc" CPPUMAKER="$(OO_SDK_HOME)/bin/cppumaker" JAVAMAKER="$(OO_SDK_HOME)/bin/javamaker" _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits