diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-21 17:18:13 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-24 13:59:58 +0200 |
| commit | b786a33cfdca2e8a4114ddef0340e0e0628dd09c (patch) | |
| tree | a0adbba80933544e1912adeb29a8e79797b7fc1c /odk/settings | |
| parent | 3535ceeac6f1b4277279082998663feb84d05487 (diff) | |
Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/std.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/odk/settings/std.mk b/odk/settings/std.mk index 6deb065f9dc1..07266311ca40 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -19,7 +19,7 @@ IDL_DIR=$(PRJ)/idl BIN_DIR=$(PRJ)/bin CLASSES_DIR=$(PRJ)/classes URE_CLASSES_DIR=$(subst \,/,$(OO_SDK_URE_JAVA_DIR)) -OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_BASE_PROGRAM_PATH))/classes +OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/classes COMP_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN)) SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag @@ -27,8 +27,8 @@ SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag URE_TYPES="$(subst \,/,$(URE_MISC)$(PS)types.rdb)" URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb) -OFFICE_TYPES="$(subst \,/,$(OFFICE_BASE_PROGRAM_PATH)$(PS)offapi.rdb)" -OFFICE_SERVICES=$(subst \\,\,$(OFFICE_BASE_PROGRAM_PATH)$(PS)services.rdb) +OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)offapi.rdb)" +OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb) OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)" |