--- a/mkspecs/common/symbian/symbian-mmp.conf	Fri Sep 17 08:34:18 2010 +0300
+++ b/mkspecs/common/symbian/symbian-mmp.conf	Mon Oct 04 01:19:32 2010 +0300
@@ -39,24 +39,7 @@
 # RVCT seems to do this automatically, but WINSCW compiler does not, so add it here.
 MMP_RULES += "USERINCLUDE ."
 
-exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis) {
-    S60_VERSION = 5.2 symbian3
-} else {
-    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.1.sis) {
-        S60_VERSION = 5.1 symbian2
-    } else {
-        exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) {
-            S60_VERSION = 5.0
-        } else {
-            exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) {
-                S60_VERSION = 3.2
-            } else {
-                S60_VERSION = 3.1
-                MMP_RULES -= PAGED BYTEPAIRCOMPRESSTARGET
-            }
-        }
-    }
-}
+contains(S60_VERSION, 3.1):MMP_RULES -= PAGED BYTEPAIRCOMPRESSTARGET
 
 QMAKE_CXXFLAGS_FAST_VFP.ARMCC = --fpmode fast
 # [TODO] QMAKE_CXXFLAGS_FAST_VFP.GCCE =
@@ -73,3 +56,15 @@
         }
     }
 }
+
+# Variables for replacing equivalent QMAKE_* variables in bld.inf for FLM execution of commands
+symbian-sbsv2 {
+    QMAKE_SBSV2_COPY           = $(GNUCP)
+    QMAKE_SBSV2_COPY_DIR       = $(GNUCP) -r
+    QMAKE_SBSV2_MOVE           = $(GNUMV)
+    QMAKE_SBSV2_DEL_FILE       = $(GNURM) -f
+    QMAKE_SBSV2_MKDIR          = $(GNUMKDIR)
+    QMAKE_SBSV2_DEL_DIR        = $(GNURMDIR)
+    QMAKE_SBSV2_DEL_TREE       = $(GNURM) -rf
+}
+