diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-10-23 22:26:34 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-23 22:58:56 +0200 |
| commit | cffdb8d6804105bc840a407a10890af556e586c9 (patch) | |
| tree | 5f13a32ca72c5716795c8b2920c7b80ea1280d7b /sdext | |
| parent | 4dc53ab0c3b3176ecfe7ea78c131d92a97d2bd14 (diff) | |
gbuild: fix XcuMergeTarget build breakage:
Introduce gb_XcuFile_for_extension function to use the right file
depending on WITH_LANG setting.
Change-Id: Ibe4fc4e28fe445fc9391b68d370039528eab7ed8
Diffstat (limited to 'sdext')
| -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 17142fccf66b..8b56ab887dad 100644 --- a/sdext/Extension_minimizer.mk +++ b/sdext/Extension_minimizer.mk @@ -43,10 +43,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_XcuMergeTarget_get_target,sdext/source/minimizer/registry/data/org/openoffice/Office/Addons.xcu) \ + $(call gb_XcuFile_for_extension,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_XcuMergeTarget_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_XcuFile_for_extension,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 bdd584f0cc12..dd70aa67e4eb 100644 --- a/sdext/Extension_presenter.mk +++ b/sdext/Extension_presenter.mk @@ -130,7 +130,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_XcuMergeTarget_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_XcuFile_for_extension,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) \ |