[Libreoffice-commits] .: solenv/gbuild

[Bjoern Michaelsen]

 solenv/gbuild/AllLangResTarget.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 58c163ab45d0cf7684a6a5feb0ec0076015bea3f
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Mar 26 15:21:44 2011 +0100

    for l10n, we should actually use the merged files

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 635ee5f..e9bcbe6 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -140,7 +140,7 @@ $(call gb_SrsTarget_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),SRS,1)
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
-		cat $^ > $@)
+		cat $(foreach part,$(PARTS),$(if $(strip $(gb_WITH_LANG)),$(call gb_SrsPartMergeTarget_get_target,$(part)),$(call gb_SrsPartTarget_get_target,$(part)))) > $@)
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_SrsTarget_get_dep_target,%) :