The R Project SVN R

Rev

Rev 50915 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 50915 Rev 51072
Line 64... Line 64...
64 
#endif
 64 
#endif
65 
 
 65 
 
66 
#ifndef WIN32
 66 
#ifndef WIN32
67 
static char rhome[] = R_HOME;
 67 
static char rhome[] = R_HOME;
68 
#else
 68 
#else
- 
 
 69 
# ifndef BINDIR
- 
 
 70 
#  define BINDIR "bin"
- 
 
 71 
# endif
69 
# define FOR_Rscript
 72 
# define FOR_Rscript
70 
# include "rterm.c"
 73 
# include "rterm.c"
71 
#endif
 74 
#endif
72 
 
 75 
 
73 
#define RSVERSION "$Rev: 50915 $"
 76 
#define RSVERSION "$Rev: 51072 $"
74 
 
 77 
 
75 
#ifdef HAVE_EXECV
 78 
#ifdef HAVE_EXECV
76 
static int verbose = 0;
 79 
static int verbose = 0;
77 
#endif
 80 
#endif
78 
 
 81 
 
Line 115... Line 118...
115 
    }
 118 
    }
116 
 
 119 
 
117 
    p = getenv("RHOME");
 120 
    p = getenv("RHOME");
118 
#ifdef WIN32
 121 
#ifdef WIN32
119 
    if(p && strlen(p))
 122 
    if(p && strlen(p))
120 
	snprintf(cmd, PATH_MAX+1, "%s\\bin\\Rterm.exe",  p);
 123 
	snprintf(cmd, PATH_MAX+1, "%s\\%s\\Rterm.exe",  p, BINDIR);
121 
    else {
 124 
    else {
122 
	char rhome[MAX_PATH];
 125 
	char rhome[MAX_PATH];
123 
	GetModuleFileName(NULL, rhome, MAX_PATH);
 126 
	GetModuleFileName(NULL, rhome, MAX_PATH);
124 
	p = strrchr(rhome,'\\');
 127 
	p = strrchr(rhome,'\\');
125 
	if(!p) {fprintf(stderr, "installation problem\n"); exit(1);}
 128 
	if(!p) {fprintf(stderr, "installation problem\n"); exit(1);}