Fix https://trac.osgeo.org/grass/ticket/1046

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@42077 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/Makefile

@@ -22,10 +22,8 @@ $(ETCDIR)/%: % | $(DSTDIRS)
 	$(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) $@

gui/wxpython/gui_modules/globalvar.py

@@ -22,8 +22,6 @@ import locale
 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