[Libreoffice-commits] core.git: RepositoryExternal.mk

[Stephan Bergmann]

 RepositoryExternal.mk |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 58d80a6f439f2834470659397ccd1913c6955d29
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Mar 19 10:39:40 2014 +0100

    gbuild: More crude hacking to fix over-evaluation of gb_ICU_PRECOMMAND
    
    ...in the spirit of 3e70e26cbc96667e2968cd325737053bf8bffb78 "gbuild: fix over-
    evaluation in gb_ExternalExecutable__set_internal"
    
    Change-Id: I43ff930267cfd3cc537e79c41a8b4167fd5c77d3

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index e9b0261..a1fbcda 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3518,7 +3518,7 @@ else # ! SYSTEM_GENBRK
 
 define gb_ExternalExecutable__register_genbrk
 $(call gb_ExternalExecutable_set_internal,genbrk,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genbrk$(gb_Executable_EXT_for_build))
-$(call gb_ExternalExecutable_set_precommand,genbrk,$(gb_ICU_PRECOMMAND))
+$(call gb_ExternalExecutable_set_precommand,genbrk,$(subst $$,$$$$,$(gb_ICU_PRECOMMAND)))
 $(call gb_ExternalExecutable_add_dependencies,genbrk,\
 	$(call gb_Package_get_target_for_build,icu) \
 )
@@ -3538,7 +3538,7 @@ else # ! SYSTEM_GENCCODE
 
 define gb_ExternalExecutable__register_genccode
 $(call gb_ExternalExecutable_set_internal,genccode,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genccode$(gb_Executable_EXT_for_build))
-$(call gb_ExternalExecutable_set_precommand,genccode,$(gb_ICU_PRECOMMAND))
+$(call gb_ExternalExecutable_set_precommand,genccode,$(subst $$,$$$$,$(gb_ICU_PRECOMMAND)))
 $(call gb_ExternalExecutable_add_dependencies,genccode,\
 	$(call gb_Package_get_target_for_build,icu) \
 )
@@ -3558,7 +3558,7 @@ else # ! SYSTEM_GENCMN
 
 define gb_ExternalExecutable__register_gencmn
 $(call gb_ExternalExecutable_set_internal,gencmn,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/gencmn$(gb_Executable_EXT_for_build))
-$(call gb_ExternalExecutable_set_precommand,gencmn,$(gb_ICU_PRECOMMAND))
+$(call gb_ExternalExecutable_set_precommand,gencmn,$(subst $$,$$$$,$(gb_ICU_PRECOMMAND)))
 $(call gb_ExternalExecutable_add_dependencies,gencmn,\
 	$(call gb_Package_get_target_for_build,icu) \
 )