[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/Extension.mk |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a899383ff7c571cd7bd8a9cdef6be6ba77191de9
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Apr 11 12:38:14 2014 +0200

    gbuild: More crude hacking to fix over-evalutation of gb_Extension_*COMMANDs
    
    ...in the spirit of 3e70e26cbc96667e2968cd325737053bf8bffb78 "gbuild: fix over-
    evaluation in gb_ExternalExecutable__set_internal"
    
    Change-Id: Ica0f8a029e18f66c470afb6a038a4746c919a8d6

diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index bf0ce74..a908006 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -308,12 +308,12 @@ $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) \
 	$$(call gb_Helper_abbreviate_dirs, \
 		mkdir -p $$(dir $$@) && \
 		$(if $(filter qtz,$(4)), \
-			$(gb_Extension_PROPMERGECOMMAND) -i $$< -o $$@ -m -l $(4) \
+			$(subst $$,$$$$,$(gb_Extension_PROPMERGECOMMAND)) -i $$< -o $$@ -m -l $(4) \
 			, \
 			$(if $(filter-out en-US,$(4)), \
 				MERGEINPUT=`$(gb_MKTEMP)` && \
 				echo $$(POFILE) > $$$${MERGEINPUT} && \
-				$(gb_Extension_PROPMERGECOMMAND) -i $$< -o $$@ -m $$$${MERGEINPUT} -l $(4) && \
+				$(subst $$,$$$$,$(gb_Extension_PROPMERGECOMMAND)) -i $$< -o $$@ -m $$$${MERGEINPUT} -l $(4) && \
 				rm -rf $$$${MERGEINPUT} \
 				, \
 				cp -f $$< $$@ \
@@ -409,18 +409,18 @@ $(call gb_Extension_get_rootdir,$(1))/help/$(5)/$(3) : \
 	$$(call gb_Helper_abbreviate_dirs, \
 		mkdir -p $$(dir $$@) && \
 		$(if $(filter qtz,$(5)), \
-			$(gb_Extension_TREEXCOMMAND) -i $$< -o $$@ -l $(5) -m \
+			$(subst $$,$$$$,$(gb_Extension_TREEXCOMMAND)) -i $$< -o $$@ -l $(5) -m \
 				-r $$(call gb_Extension_get_workdir,$(1))/help/$(5)/$(6) \
 			, \
 			$(if $(filter-out en-US,$(5)), \
 				MERGEINPUT=`$(gb_MKTEMP)` && \
 				echo $$(POFILE) > $$$${MERGEINPUT} && \
-				$(gb_Extension_TREEXCOMMAND) -i $$< -o $$@ -l $(5) \
+				$(subst $$,$$$$,$(gb_Extension_TREEXCOMMAND)) -i $$< -o $$@ -l $(5) \
 					-m $$$${MERGEINPUT} \
 					-r $$(call gb_Extension_get_workdir,$(1))/help/$(5)/$(6) && \
 				rm -rf $$$${MERGEINPUT} \
 				, \
-				$(gb_Extension_TREEXCOMMAND) -i $$< -o $$@ -l $(5) \
+				$(subst $$,$$$$,$(gb_Extension_TREEXCOMMAND)) -i $$< -o $$@ -l $(5) \
 					-r $$(call gb_Extension_get_workdir,$(1))/help/$(5)/$(6) \
 			) \
 		) \