--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm	Fri Mar 12 15:46:37 2010 +0200
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm	Mon Mar 15 12:43:09 2010 +0200
@@ -7,33 +7,29 @@
 # **
 # ****************************************************************************/
 
-include $(FLMHOME)/metaflm.mk
 
 SINGLETON:=$(call sanitise,TARGET_$(PREDEP_TARGET))
 
+MY_CMD:=$(COMMAND)
+
 # If the command has a drive letter, don't prepend EPOCROOT
-ifeq ($(findstring :,$(firstword $(COMMAND))), :)
-	MY_CMD:=$(COMMAND)
-else
-#Additional checking is necessary for the Linux compilation
-    ifeq ($(findstring $(EPOCROOT), $(firstword $(COMMAND))), $(EPOCROOT))
-	MY_CMD:=$(COMMAND)
-    else
-	MY_CMD:=$(EPOCROOT)$(COMMAND)
+ifneq ($(findstring :,$(firstword $(COMMAND))), :)
+    # Additional checking is necessary for the Linux compilation
+    ifneq ($(findstring $(EPOCROOT), $(firstword $(COMMAND))), $(EPOCROOT))
+        ifeq ($(findstring /epoc32, $(firstword $(COMMAND))), /epoc32)
+	    MY_CMD:=$(EPOCROOT)$(COMMAND)
+	 endif
     endif
 endif
 
 define qmake_extra_pre_targetdep
-$(ALLTARGET):: $(PREDEP_TARGET)
 EXPORT:: $(PREDEP_TARGET)
-LIBRARY:: $(PREDEP_TARGET)
-TARGET:: $(PREDEP_TARGET)
 
 # Prevent duplicate targets from being created
 $(SINGLETON):=1
 
 $(PREDEP_TARGET): $(DEPS) 
-	$(call startrule,qmake_extra_pre_targetdep) \
+	$(call startrule,qmake_extra_pre_targetdep,FORCESUCCESS) \
 	$(MY_CMD) \
 	$(call endrule,qmake_extra_pre_targetdep)
 endef