[Libreoffice-commits] .: Branch 'feature/killsdf' - solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/InstallModuleTarget.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4147b2646a75add70de4c1659f66fad067c017f8
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date:   Sun Oct 14 17:43:32 2012 +0200

    Cleanup in InstallModulTarget.mk
    
    Use global variable directly
    
    Change-Id: Ic8031bd748d4b9407679f83eb728a7d33551c0cf

diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index 66e5ad5..4ea77c9 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -121,7 +121,7 @@ $(call gb_Output_announce,$(2),$(true),SUM,1)
 MERGEINPUT=`$(gb_MKTEMP)` && \
 echo $(SCP_POFILES) > $${MERGEINPUT} && \
 $(call gb_Helper_abbreviate_dirs,\
-	$(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(3) -o $(1) -m $${MERGEINPUT} -l all ) && \
+	$(gb_ScpMergeTarget_COMMAND) -p scp2 -i $(SCP_SOURCE) -o $(1) -m $${MERGEINPUT} -l all ) && \
 rm -rf $${MERGEINPUT}
 
 endef
@@ -130,7 +130,7 @@ $(dir $(call gb_ScpMergeTarget_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
 $(call gb_ScpMergeTarget_get_target,%) : $(gb_ScpMergeTarget_TARGET)
-	$(call gb_ScpMergeTarget__command,$@,$*,$(SCP_SOURCE))
+	$(call gb_ScpMergeTarget__command,$@,$*)
 
 .PHONY : $(call gb_ScpMergeTarget_get_clean_target,%)
 $(call gb_ScpMergeTarget_get_clean_target,%) :