Correction for replacing text in variable.

Addes if statments tom make it look abit more readeble.

Author: henols

it.baeyens.arduino.core/src/it/baeyens/arduino/tools/ArduinoHelpers.java

@@ -70,6 +70,11 @@
  */
 public class ArduinoHelpers extends Common {
 
+	private static final String BUILD_PATH_SYSCALLS_SAM3 = "\"{build.path}/syscalls_sam3.c.o\"";
+	private static final String BUILD_PATH_ARDUINO_SYSCALLS_SAM3 = "\"{build.path}/arduino/syscalls_sam3.c.o\"";
+	private static final String BUILD_PATH_SYSCALLS_MTK = "\"{build.path}/syscalls_sam3.c.o\"";
+	private static final String BUILD_PATH_ARDUINO_SYSCALLS_MTK = "\"{build.path}/arduino/syscalls_sam3.c.o\"";
+
     /**
      * This method is the internal working class that adds the provided includepath to all configurations and languages.
      * 
@@ -642,11 +647,13 @@ private static void setTheEnvironmentVariablesAddthePlatformTxt(IContributedEnvi
 	    if (RealData.length > 0) {
 		String Var[] = RealData[0].split("=", 2); // look for assignment
 		if (Var.length == 2) {
-		    String Value = MakeEnvironmentString(Var[1].replace("\"{build.path}/syscalls_sam3.c.o\"",
-			    "\"{build.path}/arduino/syscalls_sam3.c.o\""));
-		    Value = MakeEnvironmentString(Var[1].replace("\"{build.path}/syscalls_mtk.c.o\"",
-			    "\"{build.path}/arduino/syscalls_mtk.c.o\""));
-		    var = new EnvironmentVariable(MakeKeyString(Var[0]), Value);
+		    String value = Var[1];
+		    if (value.contains(BUILD_PATH_SYSCALLS_SAM3)) {
+			value = MakeEnvironmentString(value.replace(BUILD_PATH_SYSCALLS_SAM3, BUILD_PATH_ARDUINO_SYSCALLS_SAM3));
+		    } else if (value.contains(BUILD_PATH_SYSCALLS_MTK)) {
+			value = MakeEnvironmentString(value.replace(BUILD_PATH_SYSCALLS_MTK, BUILD_PATH_ARDUINO_SYSCALLS_MTK));
+		    }
+		    var = new EnvironmentVariable(MakeKeyString(Var[0]), value);
 		    contribEnv.addVariable(var, confDesc);
 		}
 	    }