[GRASS-SVN] r42077 - in grass/trunk/gui/wxpython: . gui_modules

[svn_grass at osgeo.org]

Author: glynn
Date: 2010-05-01 11:23:47 -0400 (Sat, 01 May 2010)
New Revision: 42077

Modified:
   grass/trunk/gui/wxpython/Makefile
   grass/trunk/gui/wxpython/gui_modules/globalvar.py
Log:
Fix #1046


Modified: grass/trunk/gui/wxpython/Makefile
===================================================================
--- grass/trunk/gui/wxpython/Makefile	2010-05-01 10:47:40 UTC (rev 42076)
+++ grass/trunk/gui/wxpython/Makefile	2010-05-01 15:23:47 UTC (rev 42077)
@@ -22,10 +22,8 @@
 	$(INSTALL_DATA) $< $@
 
 menustrings.py: gui_modules/menudata.py $(ETCDIR)/xml/menudata.xml $(ETCDIR)/xml/menudata_modeler.xml 
-	GISBASE="$(GISBASE)" \
-	$(PYTHON) $< > $@
-	GISBASE="$(GISBASE)" \
-	$(PYTHON) $< "modeler" >> $@
+	$(call run_grass,$(PYTHON) $< > $@)
+	$(call run_grass,$(PYTHON) $< "modeler" >> $@)
 
 $(DSTDIRS): %: | $(ETCDIR)
 	$(MKDIR) $@

Modified: grass/trunk/gui/wxpython/gui_modules/globalvar.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/globalvar.py	2010-05-01 10:47:40 UTC (rev 42076)
+++ grass/trunk/gui/wxpython/gui_modules/globalvar.py	2010-05-01 15:23:47 UTC (rev 42077)
@@ -22,8 +22,6 @@
 import gettext
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode=True)
 
-grassPath = os.path.join(globalvar.ETCDIR, "python")
-sys.path.append(grassPath)
 import grass.script as grass
 
 # wxversion.select() called once at the beginning