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

[Libreoffice Gerrit user]

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

New commits:
commit a79d7194b55dec1bd5af89637a0f4b169b60fd84
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Oct 3 07:34:19 2012 +0200

    use $(PERL)

diff --git a/translations/CustomTarget_translate.mk b/translations/CustomTarget_translate.mk
index 5f24418..e7aeab7 100644
--- a/translations/CustomTarget_translate.mk
+++ b/translations/CustomTarget_translate.mk
@@ -50,7 +50,7 @@ $(translations_DIR)/merge.done : \
 	$(call gb_Helper_abbreviate_dirs, \
 		rm -rf $(translations_DIR)/sdf && mkdir $(translations_DIR)/sdf && \
 		RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,$(filter %.sdf,$^)) && \
-		perl $(OUTDIR_FOR_BUILD)/bin/fast_merge.pl -sdf_files $${RESPONSEFILE} \
+		$(PERL) $(OUTDIR_FOR_BUILD)/bin/fast_merge.pl -sdf_files $${RESPONSEFILE} \
 			-merge_dir $(translations_DIR)/sdf \
 			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null) && \
 		rm -f $${RESPONSEFILE} && \
@@ -82,7 +82,7 @@ $(translations_DIR)/sdf-l10n/qtz.sdf : \
 		$(OUTDIR_FOR_BUILD)/bin/keyidGen.pl | $(translations_DIR)/sdf-l10n/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SDF,1)
 	$(call gb_Helper_abbreviate_dirs, \
-		perl $(OUTDIR_FOR_BUILD)/bin/keyidGen.pl $< $@ \
+		$(PERL) $(OUTDIR_FOR_BUILD)/bin/keyidGen.pl $< $@ \
 			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
 
 $(translations_DIR)/sdf-template/en-US.sdf : $(OUTDIR_FOR_BUILD)/bin/propex \
commit a2c80f7cd878c4eacba2940e3208d86fb479ce3c
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Oct 3 07:33:39 2012 +0200

    add dep on python

diff --git a/translations/CustomTarget_translate.mk b/translations/CustomTarget_translate.mk
index 8204722..5f24418 100644
--- a/translations/CustomTarget_translate.mk
+++ b/translations/CustomTarget_translate.mk
@@ -63,6 +63,7 @@ $(translations_DIR)/sdf-l10n/%.sdf : \
 		$(translations_DIR)/sdf-template/en-US.sdf \
 		$(OUTDIR_FOR_BUILD)/bin/po2lo \
 		| $(translations_DIR)/sdf-l10n/.dir
+		  $(gb_PYTHONTARGET)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SDF,1)
 	$(call gb_Helper_abbreviate_dirs, \
 		$(gb_PYTHON) $(OUTDIR_FOR_BUILD)/bin/po2lo --skipsource -i \
commit 5d4ef2dbc3d0e93756a0efdf22c8eb03961e8f9b
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Oct 3 07:32:36 2012 +0200

    internal python wants mixed path on windows

diff --git a/translations/CustomTarget_translate.mk b/translations/CustomTarget_translate.mk
index 7249e39..8204722 100644
--- a/translations/CustomTarget_translate.mk
+++ b/translations/CustomTarget_translate.mk
@@ -66,7 +66,7 @@ $(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 \
-			$(realpath $(SRCDIR)/translations/source/$*) -t $< -o $@ -l $*)
+			$(call gb_Helper_symlinked_native,$(SRCDIR)/translations/source/$*) -t $< -o $@ -l $*)
 
 define translations_make_po_deps
 $(translations_DIR)/sdf-l10n/$(1).sdf : \