Browse Source

fix wxGUI compilation (merge from devbr6)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@34829 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 16 years ago
parent
commit
e1ee36126c
2 changed files with 11 additions and 4 deletions
  1. 1 1
      gui/wxpython/Makefile
  2. 10 3
      gui/wxpython/gui_modules/menudata.py

+ 1 - 1
gui/wxpython/Makefile

@@ -30,4 +30,4 @@ $(ETCDIR)/%: %
 	$(INSTALL_DATA) $< $@
 
 menustrings.py: gui_modules/menudata.py xml/menudata.xml
-	python $< > $@
+	python $< $(GISBASE) > $@

+ 10 - 3
gui/wxpython/gui_modules/menudata.py

@@ -25,8 +25,10 @@ except ImportError:
 
 class Data:
     '''Data object that returns menu descriptions to be used in wxgui.py.'''
-    def __init__(self):
-	filename = os.getenv('GISBASE') + '/etc/wxpython/xml/menudata.xml'
+    def __init__(self, gisbase=None):
+        if not gisbase:
+            gisbase = os.getenv('GISBASE')
+	filename = gisbase + '/etc/wxpython/xml/menudata.xml'
 	self.tree = etree.parse(filename)
 
     def getMenuItem(self, mi):
@@ -70,4 +72,9 @@ class Data:
 
 if __name__ == "__main__":
     import sys
-    Data().PrintStrings(sys.stdout)
+    if len(sys.argv) < 2:
+        sys.exit(1)
+    
+    Data(sys.argv[1]).PrintStrings(sys.stdout)
+    
+    sys.exit(0)