--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm	Fri Mar 12 15:46:37 2010 +0200
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm	Mon Mar 15 12:43:09 2010 +0200
@@ -7,20 +7,23 @@
 # **
 # ****************************************************************************/
 
-include $(FLMHOME)/metaflm.mk
 
 SINGLETON:=$(call sanitise,TARGET_$(DEPLOY_TARGET))
 CLEAN_TARGET:=
 
+# add EPOCROOT if missing (not if drive letters are present)
 ifeq ($(findstring :,$(firstword $(DEPLOY_TARGET))), :)
 	DEPLOY_TARGET:=$(DEPLOY_TARGET)
 else
-	DEPLOY_TARGET:=$(EPOCROOT)$(DEPLOY_TARGET)
+    ifeq ($(findstring $(EPOCROOT), $(firstword $(DEPLOY_TARGET))), $(EPOCROOT))
+        DEPLOY_TARGET:=$(DEPLOY_TARGET)
+    else
+        DEPLOY_TARGET:=$(EPOCROOT)$(DEPLOY_TARGET)
+    endif
 endif
 
 define qmake_emulator_deployment
 $(ALLTARGET):: $(1)
-FINAL::$(1)
 
 # Prevent duplicate targets from being created
 $(SINGLETON):=1