summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-05-04 16:44:22 +0200
committerDavid Tardon <dtardon@redhat.com>2012-05-04 16:45:35 +0200
commit63417ac5d3e07d370e652d7dedf5c189cc7e7e34 (patch)
treec9f6bd583f3a31c1cf5397846eaa25507f9117a8 /sdext
parent9694abe2b6c8525856a316a08a3ebe9d4bb600b5 (diff)
fdo#49136 use localized .xcu files
Diffstat (limited to 'sdext')
-rw-r--r--sdext/Extension_minimizer.mk4
-rw-r--r--sdext/Extension_presenter.mk2
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) \