The R Project SVN – R – Diff – /trunk/src/gnuwin32/front-ends/rcmdfn.c

     char *p, cmd[CMD_LEN];
     char RCMD[] = "R CMD";
     int len = strlen(argv[0]);
     char *env_path;
     int timing = 1;
+    int dirstrip = 2;
+#ifdef R_ARCH
+    if (strlen(R_ARCH) > 0)
+	dirstrip++;
+#endif
-    char *RHome = getRHOME(3);
+    char *RHome = getRHOME(dirstrip);
     if(!RHome)
         R_Suicide("Invalid R_HOME");
     if(!strncmp(argv[0]+len-4, "Rcmd", 4) ||
     /* no free here: storage remains in use */
     char *Rarch = malloc(30);
     if (!Rarch)
 	R_Suicide("Allocation error");
-    strcpy(Rarch, "R_ARCH=/");
+    strcpy(Rarch, "R_ARCH=");
+#ifdef R_ARCH
+    if (strlen(R_ARCH) > 0) {
+	strcat(Rarch, "/");
-    strcat(Rarch, R_ARCH);
+	strcat(Rarch, R_ARCH);
+    }
+#endif
     putenv(Rarch);
     /* no free here: storage remains in use */
     R_putenv_path_cpy("BINDIR", BINDIR, 0);

The R Project SVN R