diff options
-rw-r--r-- | sdext/Extension_minimizer.mk | 4 | ||||
-rw-r--r-- | sdext/Extension_presenter.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk index cebdc9ca103d..400c2902bbb2 100644 --- a/sdext/Extension_minimizer.mk +++ b/sdext/Extension_minimizer.mk @@ -47,10 +47,10 @@ $(eval $(call gb_Extension_add_files,presentation-minimizer,bitmaps,\ $(eval $(call gb_Extension_add_file,presentation-minimizer,registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs,$(call gb_XcsTarget_get_target,sdext/source/minimizer/registry/schema/org/openoffice/Office/extension/SunPresentationMinimizer.xcs))) $(eval $(call gb_Extension_add_files,presentation-minimizer,registry/data/org/openoffice/Office,\ - $(call gb_XcuDataTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu) \ + $(call gb_XcuMergeTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu) \ $(call gb_XcuDataTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \ )) -$(eval $(call gb_Extension_add_file,presentation-minimizer,registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu,$(call gb_XcuDataTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu))) +$(eval $(call gb_Extension_add_file,presentation-minimizer,registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu,$(call gb_XcuMergeTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu))) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk index 66596643d2c9..1311310d2c39 100644 --- a/sdext/Extension_presenter.mk +++ b/sdext/Extension_presenter.mk @@ -134,7 +134,7 @@ $(eval $(call gb_Extension_add_files,presenter-screen,bitmaps,\ $(eval $(call gb_Extension_add_file,presenter-screen,registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs,$(call gb_XcsTarget_get_target,sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs))) -$(eval $(call gb_Extension_add_file,presenter-screen,registry/data/org/openoffice/Office/extension/PresenterScreen.xcu,$(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu))) +$(eval $(call gb_Extension_add_file,presenter-screen,registry/data/org/openoffice/Office/extension/PresenterScreen.xcu,$(call gb_XcuMergeTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu))) $(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffice/Office,\ $(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu) \ |