summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-04-27 07:59:22 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-04-27 07:59:22 (GMT)
commite26f32ef8e1480f80e362059cc03c4b5a7fb92e9 (patch)
tree91633e4922fe47e86efa8e6d2993f5c8224af106 /mkspecs
parent04b8d70bb0965f868ffa78595c7afc99675e656e (diff)
downloadQt-e26f32ef8e1480f80e362059cc03c4b5a7fb92e9.zip
Qt-e26f32ef8e1480f80e362059cc03c4b5a7fb92e9.tar.gz
Qt-e26f32ef8e1480f80e362059cc03c4b5a7fb92e9.tar.bz2
Fixed emulator deployment for symbian-sbsv2
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm21
1 files changed, 13 insertions, 8 deletions
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
index 8c5ad9e..354ce26 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
@@ -10,25 +10,30 @@
include $(FLMHOME)/metaflm.mk
SINGLETON:=$(call sanitise,TARGET_$(DEPLOY_TARGET))
+CLEAN_TARGET:=
define qmake_emulator_deployment
-$(ALLTARGET):: $(DEPLOY_TARGET)
-FINAL:: $(DEPLOY_TARGET)
+$(ALLTARGET):: $(1)
+FINAL::$(1)
# Prevent duplicate targets from being created
$(SINGLETON):=1
-$(DEPLOY_TARGET): $(DEPLOY_SOURCE)
+CLEAN_TARGET:=$(1)
+
+$(1): $(2)
$(call startrule,qmake_emulator_deployment) \
- $(GNUCP) -u -T $(DEPLOY_SOURCE) $(DEPLOY_TARGET) \
- $(call endrule,qmake_emulator_deployment)
+ $(GNUCP) --no-preserve=mode $(2) "$$@" && \
+ $(GNUCHMOD) a+rw "$$@" \
+ $(call endrule,qmake_emulator_deployment)
endef
ifeq ($($(SINGLETON)),)
-$(eval $(qmake_emulator_deployment))
+$(eval $(call qmake_emulator_deployment, $(subst $(CHAR_SPACE),\$(CHAR_SPACE),$(DEPLOY_TARGET)), $(subst $(CHAR_SPACE),\$(CHAR_SPACE),$(DEPLOY_SOURCE))))
+$(call makepath,$(dir $(DEPLOY_TARGET)))
+$(eval $(call GenerateStandardCleanTarget,$(CLEAN_TARGET),''))
endif
-$(call makepathfor,$(DEPLOY_TARGET))
-$(eval $(call GenerateStandardCleanTarget,$(DEPLOY_TARGET),''))
+