diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-06-17 08:39:21 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-06-17 08:39:21 +0000 |
| commit | 25e0166d0685d070bad15e1832553fe505e753fd (patch) | |
| tree | d59175b44aafc0f10e52f5124878bacf9245f0f8 | |
| parent | INTEGRATION: CWS sb31 (1.15.2); FILE MERGED (diff) | |
| download | core-25e0166d0685d070bad15e1832553fe505e753fd.tar.gz core-25e0166d0685d070bad15e1832553fe505e753fd.zip | |
INTEGRATION: CWS sb31 (1.7.14); FILE MERGED
2005/06/10 13:45:11 sb 1.7.14.1: #121392# Added URE_TYPES, URE_SERVICES to SDK std.mk.
| -rw-r--r-- | odk/settings/std.mk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/odk/settings/std.mk b/odk/settings/std.mk index f9b2300e9d91..8671231857ac 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -20,7 +20,15 @@ CLASSES_DIR=$(PRJ)/classes OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/classes COMP_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN)) -OFFICE_TYPE_LIBRARY=$(subst \\,\,"$(OFFICE_PROGRAM_PATH)$(PS)types.rdb") +ifneq "$(OO_SDK_URE_HOME)" "" +URE_TYPES=$(subst \\,\,$(URE_MISC)$(PS)types.rdb) +URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb) +else +URE_TYPES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)types.rdb) +URE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb) +endif + +OFFICE_TYPE_LIBRARY="$(URE_TYPES)" # DKREGISTRYNAME is only for compatibility reasons DKREGISTRYNAME=$(OFFICE_TYPE_LIBRARY) |