diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-17 00:15:06 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-17 00:15:06 +0200 |
| commit | bfeb4126108ab307d7843cf9f32acf95ae60d06a (patch) | |
| tree | 8909c02fc0251ab79d5bfe7fadc2794fef4e6022 /odk/settings | |
| parent | 4845fd13cb3dde2320df429c2660d95af0f5df64 (diff) | |
Fix OFFICE_PROGRAM_PATH for new Mac OS X layout
Change-Id: Id8c6082b4b90c3020e1187dd311f0afd0320d155
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/std.mk | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/odk/settings/std.mk b/odk/settings/std.mk index 7d76d9090904..9fe1e79d3a54 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -37,7 +37,11 @@ IDL_DIR=$(PRJ)/idl BIN_DIR=$(PRJ)/bin CLASSES_DIR=$(PRJ)/classes URE_CLASSES_DIR=$(subst \,/,$(OO_SDK_URE_JAVA_DIR)) +ifeq "$(PLATFORM)" "macosx" +OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/../Resources/java +else OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/classes +endif COMP_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN)) SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag @@ -45,8 +49,13 @@ SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag URE_TYPES="$(subst \,/,$(URE_MISC)$(PS)types.rdb)" URE_SERVICES="$(subst \\,\,$(URE_MISC)$(PS)services.rdb)" +ifeq "$(PLATFORM)" "macosx" +OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)..$(PS)Resources$(PS)types$(PS)offapi.rdb)" +OFFICE_SERVICES="$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)..$(PS)Resources$(PS)services$(PS)services.rdb)" +else OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types$(PS)offapi.rdb)" OFFICE_SERVICES="$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services$(PS)services.rdb)" +endif OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)" |