[Libreoffice-commits] .: 2 commits - translations/CustomTarget_translate.mk

[Libreoffice Gerrit user]

 translations/CustomTarget_translate.mk |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 0ecde13e1c9342071aab1973cd888f451ab783cb
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Sep 25 20:07:37 2012 +0200

    use absolute paths

diff --git a/translations/CustomTarget_translate.mk b/translations/CustomTarget_translate.mk
index 2827355..0bd41ef 100644
--- a/translations/CustomTarget_translate.mk
+++ b/translations/CustomTarget_translate.mk
@@ -58,6 +58,7 @@ $(translations_DIR)/merge.done : \
 			$(WORKDIR)/CustomTarget/translations/localization_present.mk && \
 		touch $@)
 
+# TODO: remove the realpaths when we have git submodules
 $(translations_DIR)/sdf-l10n/%.sdf : \
 		$(translations_DIR)/sdf-template/en-US.sdf \
 		$(OUTDIR_FOR_BUILD)/bin/po2lo \
@@ -65,11 +66,11 @@ $(translations_DIR)/sdf-l10n/%.sdf : \
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SDF,1)
 	$(call gb_Helper_abbreviate_dirs, \
 		$(gb_PYTHON) $(OUTDIR_FOR_BUILD)/bin/po2lo --skipsource -i \
-			source/$* -t $< -o $@ -l $*)
+			$(realpath $(SRCDIR)/translations/source/$*) -t $< -o $@ -l $*)
 
 define translations_make_po_deps
 $(translations_DIR)/sdf-l10n/$(1).sdf : \
-		$$(shell find $(SRCDIR)/translations/source/$(1) -name "*\.po")
+		$$(shell find $(realpath $(SRCDIR)/translations/source/$(1)) -name "*\.po")
 
 endef
 
commit c8fa8471c2032f6790c48885c51c0ab3daab6380
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Sep 25 18:56:22 2012 +0200

    only process sdf files

diff --git a/translations/CustomTarget_translate.mk b/translations/CustomTarget_translate.mk
index d5bb6a4..2827355 100644
--- a/translations/CustomTarget_translate.mk
+++ b/translations/CustomTarget_translate.mk
@@ -49,7 +49,7 @@ $(translations_DIR)/merge.done : \
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MRG,2)
 	$(call gb_Helper_abbreviate_dirs, \
 		rm -rf $(translations_DIR)/sdf && mkdir $(translations_DIR)/sdf && \
-		RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$^) && \
+		RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter %.sdf,$^)) && \
 		perl $(OUTDIR_FOR_BUILD)/bin/fast_merge.pl -sdf_files $${RESPONSEFILE} \
 			-merge_dir $(translations_DIR)/sdf \
 			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null) && \