[Libreoffice-commits] .: Dictionary_en.mk Dictionary_hu.mk Dictionary_ru.mk

[Libreoffice Gerrit user]

 Dictionary_en.mk |    2 +-
 Dictionary_hu.mk |    2 +-
 Dictionary_ru.mk |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 53e9940d33caa1e8a00ddaadfb57e5d668d35378
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 23 22:23:29 2012 +0200

    gbuild: fix XcuMergeTarget build breakage:
    
    Introduce gb_XcuFile_for_extension function to use the right file depending on
    WITH_LANG setting.

diff --git a/Dictionary_en.mk b/Dictionary_en.mk
index 7bd9760..6558f6d 100644
--- a/Dictionary_en.mk
+++ b/Dictionary_en.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Dictionary_add_files,dict-en,pythonpath,\
 $(eval $(call gb_Dictionary_add_generated_file,dict-en,dialog/OptionsDialog.xcs,$(call gb_XcsTarget_get_target,dictionaries/en/dialog/registry/schema/org/openoffice/Lightproof_en.xcs)))
 
 $(eval $(call gb_Dictionary_add_generated_files,dict-en,dialog,\
-	$(call gb_XcuMergeTarget_get_target,dictionaries/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu) \
+	$(call gb_XcuFile_for_extension,dictionaries/en/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu) \
 ))
 
 $(eval $(call gb_Dictionary_add_propertyfiles,dict-en,dialog,\
diff --git a/Dictionary_hu.mk b/Dictionary_hu.mk
index ad2328e..e151818 100644
--- a/Dictionary_hu.mk
+++ b/Dictionary_hu.mk
@@ -51,7 +51,7 @@ $(eval $(call gb_Dictionary_add_files,dict-hu,pythonpath,\
 $(eval $(call gb_Dictionary_add_generated_file,dict-hu,dialog/OptionsDialog.xcs,$(call gb_XcsTarget_get_target,dictionaries/hu_HU/dialog/registry/schema/org/openoffice/Lightproof_hu_HU.xcs)))
 
 $(eval $(call gb_Dictionary_add_generated_files,dict-hu,dialog,\
-	$(call gb_XcuMergeTarget_get_target,dictionaries/hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu) \
+	$(call gb_XcuFile_for_extension,dictionaries/hu_HU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu) \
 ))
 
 $(eval $(call gb_Dictionary_add_propertyfiles,dict-hu,dialog,\
diff --git a/Dictionary_ru.mk b/Dictionary_ru.mk
index 4321862..ceab3e2 100644
--- a/Dictionary_ru.mk
+++ b/Dictionary_ru.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Dictionary_add_propertyfiles,dict-ru,dialog,\
 $(eval $(call gb_Dictionary_add_generated_file,dict-ru,dialog/OptionsDialog.xcs,$(call gb_XcsTarget_get_target,dictionaries/ru_RU/dialog/registry/schema/org/openoffice/Lightproof_ru_RU.xcs)))
 
 $(eval $(call gb_Dictionary_add_generated_files,dict-ru,dialog,\
-	$(call gb_XcuMergeTarget_get_target,dictionaries/ru_RU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu) \
+	$(call gb_XcuFile_for_extension,dictionaries/ru_RU/dialog/registry/data/org/openoffice/Office/OptionsDialog.xcu) \
 ))
 
 $(eval $(call gb_Dictionary_add_thesauri,dict-ru,\