[GRASS-SVN] r40857 - in grass/branches/develbranch_6: general/g.dirseps general/g.mkfontcap lib/gis

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-02-07 21:30:59 -0500 (Sun, 07 Feb 2010)
New Revision: 40857

Modified:
   grass/branches/develbranch_6/general/g.dirseps/main.c
   grass/branches/develbranch_6/general/g.mkfontcap/main.c
   grass/branches/develbranch_6/lib/gis/gisinit.c
Log:
Revert r40854 (breaks g.proj, g.gisenv)
 Inhibit reading of $GISRC for g.dirseps and g.mkfontcap



Modified: grass/branches/develbranch_6/general/g.dirseps/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.dirseps/main.c	2010-02-08 02:29:07 UTC (rev 40856)
+++ grass/branches/develbranch_6/general/g.dirseps/main.c	2010-02-08 02:30:59 UTC (rev 40857)
@@ -28,6 +28,7 @@
 
     G_set_program_name(argv[0]);
     G_no_gisinit();
+    G_set_gisrc_mode(G_GISRC_MODE_MEMORY);
 
     module = G_define_module();
     module->keywords = "general";

Modified: grass/branches/develbranch_6/general/g.mkfontcap/main.c
===================================================================
--- grass/branches/develbranch_6/general/g.mkfontcap/main.c	2010-02-08 02:29:07 UTC (rev 40856)
+++ grass/branches/develbranch_6/general/g.mkfontcap/main.c	2010-02-08 02:30:59 UTC (rev 40857)
@@ -59,6 +59,7 @@
 
     G_set_program_name(argv[0]);
     G_no_gisinit();
+    G_set_gisrc_mode(G_GISRC_MODE_MEMORY);
 
     module = G_define_module();
     module->keywords = "general";

Modified: grass/branches/develbranch_6/lib/gis/gisinit.c
===================================================================
--- grass/branches/develbranch_6/lib/gis/gisinit.c	2010-02-08 02:29:07 UTC (rev 40856)
+++ grass/branches/develbranch_6/lib/gis/gisinit.c	2010-02-08 02:30:59 UTC (rev 40857)
@@ -90,8 +90,6 @@
 	G_fatal_error(_("Incompatible library version for module. "
 			"You need to rebuild GRASS or untangle multiple installations."));
 
-    G_set_gisrc_mode(G_GISRC_MODE_MEMORY);
-
     gisinit();
 
     return 0;