/[zanavi_public1]/navit/navit/main.c
ZANavi

Diff of /navit/navit/main.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 2 Revision 27
… …
345 setlocale(LC_ALL,""); 345 setlocale(LC_ALL,"");
346 setlocale(LC_NUMERIC,"C"); 346 setlocale(LC_NUMERIC,"C");
347#if !defined _WIN32 && !defined _WIN32_WCE 347#if !defined _WIN32 && !defined _WIN32_WCE
348 if (file_exists("navit.c") || file_exists("navit.o") || file_exists("navit.lo") || file_exists("version.h")) { 348 if (file_exists("navit.c") || file_exists("navit.o") || file_exists("navit.lo") || file_exists("version.h")) {
349 char buffer[PATH_MAX]; 349 char buffer[PATH_MAX];
350 printf(_("Running from source directory\n")); 350 printf("Running from source directory\n");
351 getcwd(buffer, PATH_MAX); /* libc of navit returns "dummy" */ 351 getcwd(buffer, PATH_MAX); /* libc of navit returns "dummy" */
352 setenv("NAVIT_PREFIX", buffer, 0); 352 setenv("NAVIT_PREFIX", buffer, 0);
353 main_setup_environment(0); 353 main_setup_environment(0);
354 } else { 354 } else {
355 if (!getenv("NAVIT_PREFIX")) { 355 if (!getenv("NAVIT_PREFIX")) {
… …
360 progpath_len=strlen(progpath); 360 progpath_len=strlen(progpath);
361 if (l > progpath_len && !strcmp(program+l-progpath_len,progpath)) { 361 if (l > progpath_len && !strcmp(program+l-progpath_len,progpath)) {
362 s=g_strdup(program); 362 s=g_strdup(program);
363 s[l-progpath_len]='\0'; 363 s[l-progpath_len]='\0';
364 if (strcmp(s, PREFIX)) 364 if (strcmp(s, PREFIX))
365 {
365 printf(_("setting '%s' to '%s'\n"), "NAVIT_PREFIX", s); 366 // printf("setting '%s' to '%s'\n", "NAVIT_PREFIX", s);
367 }
366 setenv("NAVIT_PREFIX", s, 0); 368 setenv("NAVIT_PREFIX", s, 0);
367 g_free(s); 369 g_free(s);
368 } else 370 } else
369 setenv("NAVIT_PREFIX", PREFIX, 0); 371 setenv("NAVIT_PREFIX", PREFIX, 0);
370 } 372 }
Legend:
Removed from v.2  
changed lines
  Added in v.27
   
Visit the ZANavi Wiki