[GRASS-SVN] r60009 - in grass/trunk: general/g.gui lib/gis

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-05-01 09:14:09 -0700 (Thu, 01 May 2014)
New Revision: 60009

Modified:
   grass/trunk/general/g.gui/main.c
   grass/trunk/lib/gis/parser.c
Log:
libgis+g.gui: wxGUI moved to DISTDIR/gui


Modified: grass/trunk/general/g.gui/main.c
===================================================================
--- grass/trunk/general/g.gui/main.c	2014-05-01 16:12:10 UTC (rev 60008)
+++ grass/trunk/general/g.gui/main.c	2014-05-01 16:14:09 UTC (rev 60009)
@@ -114,7 +114,7 @@
     G_message(_("Launching <%s> GUI in the background, please wait..."), type->answer);
 
     if (strcmp(type->answer, "wxpython") == 0) {
-	sprintf(progname, "%s/etc/gui/wxpython/wxgui.py", G_gisbase());
+	sprintf(progname, "%s/gui/wxpython/wxgui.py", G_gisbase());
 	if (rc_file->answer) {
 	    G_spawn_ex(getenv("GRASS_PYTHON"), getenv("GRASS_PYTHON"), progname,
 		    "--workspace", rc_file->answer, SF_BACKGROUND, NULL);

Modified: grass/trunk/lib/gis/parser.c
===================================================================
--- grass/trunk/lib/gis/parser.c	2014-05-01 16:12:10 UTC (rev 60008)
+++ grass/trunk/lib/gis/parser.c	2014-05-01 16:14:09 UTC (rev 60009)
@@ -805,7 +805,7 @@
     if (!st->pgm_path)
 	G_fatal_error(_("Unable to determine program name"));
 
-    sprintf(script, "%s/etc/gui/wxpython/gui_core/forms.py",
+    sprintf(script, "%s/gui/wxpython/gui_core/forms.py",
 	    getenv("GISBASE"));
     G_spawn(getenv("GRASS_PYTHON"), getenv("GRASS_PYTHON"), script, G_recreate_command(), NULL);
 }