--- a/buildframework/helium/sf/java/imaker/src/com/nokia/helium/imaker/ant/engines/build_imaker_roms_signing.mk.ftl	Tue Apr 27 08:33:08 2010 +0300
+++ b/buildframework/helium/sf/java/imaker/src/com/nokia/helium/imaker/ant/engines/build_imaker_roms_signing.mk.ftl	Wed Jun 16 16:51:40 2010 +0300
@@ -54,11 +54,11 @@
     <#list cmds as cmd>
         <#assign cmdline="">
         <#list cmd.getArguments() as arg>
-            <#assign cmdline="${cmdline} ${arg}">
+            <#assign cmdline="${cmdline} \"${arg}\"">
         </#list>
         <#assign vars=cmd.getVariables()>
         <#list vars?keys as var>
-            <#assign cmdline="${cmdline} ${var}=${vars[var]}">
+            <#assign cmdline="${cmdline} \"${var}=${vars[var]}\"">
         </#list>
 	@echo $(call iif,$(USE_UNIX),,cmd /c) ${cmd.getCommand()} WORKDIR=$(ROMBUILD_TEMPDIR)/config_${iid} ${cmdline} ${cmd.getTarget()}-dir >> $(ROMBUILD_TEMPDIR)/command-dir-list-${cid}.txt 
 <#assign iid=iid+1>
@@ -70,11 +70,11 @@
     <#list cmds as cmd>
         <#assign cmdline="">
         <#list cmd.getArguments() as arg>
-            <#assign cmdline="${cmdline} ${arg}">
+            <#assign cmdline="${cmdline} \"${arg}\"">
         </#list>
         <#assign vars=cmd.getVariables()>
         <#list vars?keys as var>
-            <#assign cmdline="${cmdline} ${var}=${vars[var]}">
+            <#assign cmdline="${cmdline} \"${var}=${vars[var]}\"">
         </#list>
 #
 #  Building configuration ${iid}.
@@ -104,11 +104,11 @@
     <#list cmds as cmd>
         <#assign cmdline="">
         <#list cmd.getArguments() as arg>
-            <#assign cmdline="${cmdline} ${arg}">
+            <#assign cmdline="${cmdline} \"${arg}\"">
         </#list>
         <#assign vars=cmd.getVariables()>
         <#list vars?keys as var>
-            <#assign cmdline="${cmdline} ${var}=${vars[var]}">
+            <#assign cmdline="${cmdline} \"${var}=${vars[var]}\"">
         </#list>
 	@echo $(call iif,$(USE_UNIX),,cmd /c) ${cmd.getCommand()} WORKDIR=$(ROMBUILD_TEMPDIR)/config_${iid} ${cmdline} ${cmd.getTarget()}-e2flash >> $(ROMBUILD_TEMPDIR)/command-e2flash-list-${cid}.txt 
 <#assign iid=iid+1>