[GRASS-SVN] r63999 - in grass-addons/grass7/gui/wxpython/wx.metadata: g.gui.metadata mdlib r.info.iso v.info.iso

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-01-08 09:29:44 -0800 (Thu, 08 Jan 2015)
New Revision: 63999

Modified:
   grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/Makefile
   grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/g.gui.metadata.py
   grass-addons/grass7/gui/wxpython/wx.metadata/mdlib/Makefile
   grass-addons/grass7/gui/wxpython/wx.metadata/r.info.iso/r.info.iso.py
   grass-addons/grass7/gui/wxpython/wx.metadata/v.info.iso/v.info.iso.py
Log:
wx.metadata: fix compilation issues


Modified: grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/Makefile
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/Makefile	2015-01-08 17:09:49 UTC (rev 63998)
+++ grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/Makefile	2015-01-08 17:29:44 UTC (rev 63999)
@@ -5,7 +5,7 @@
 include $(MODULE_TOPDIR)/include/Make/Script.make
 include $(MODULE_TOPDIR)/include/Make/Python.make
 
-DSTDIR = $(ETC)
+DSTDIR = $(ETC)/mdlib
 
 MODULES = editor.py
 

Modified: grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/g.gui.metadata.py
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/g.gui.metadata.py	2015-01-08 17:09:49 UTC (rev 63998)
+++ grass-addons/grass7/gui/wxpython/wx.metadata/g.gui.metadata/g.gui.metadata.py	2015-01-08 17:29:44 UTC (rev 63999)
@@ -33,7 +33,7 @@
 import glob
 from lxml import etree
 
-sys.path.insert(1, os.path.join(os.path.dirname(sys.path[0]), 'etc', 'wx.metadata'))
+sys.path.insert(1, os.path.join(os.path.dirname(sys.path[0]), 'etc', 'mdlib'))
 
 import wx
 from wx.lib.buttons import ThemedGenBitmapTextButton as BitmapBtnTxt

Modified: grass-addons/grass7/gui/wxpython/wx.metadata/mdlib/Makefile
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.metadata/mdlib/Makefile	2015-01-08 17:09:49 UTC (rev 63998)
+++ grass-addons/grass7/gui/wxpython/wx.metadata/mdlib/Makefile	2015-01-08 17:29:44 UTC (rev 63999)
@@ -3,7 +3,7 @@
 include $(MODULE_TOPDIR)/include/Make/Other.make
 include $(MODULE_TOPDIR)/include/Make/Python.make
 
-DSTDIR = $(ETC)
+DSTDIR = $(ETC)/mdlib
 
 MODULES = $(wildcard *.py)
 

Modified: grass-addons/grass7/gui/wxpython/wx.metadata/r.info.iso/r.info.iso.py
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.metadata/r.info.iso/r.info.iso.py	2015-01-08 17:09:49 UTC (rev 63998)
+++ grass-addons/grass7/gui/wxpython/wx.metadata/r.info.iso/r.info.iso.py	2015-01-08 17:29:44 UTC (rev 63999)
@@ -41,7 +41,7 @@
 from grass.pygrass.utils import get_lib_path
 
 def load_mdlib():
-    path = get_lib_path(modname='wx.metadata', libname='mdgrass')
+    path = get_lib_path(modname='mdlib', libname='mdgrass')
     if path is None:
         fatal("Not able to find the metadata library directory")
     sys.path.append(path)

Modified: grass-addons/grass7/gui/wxpython/wx.metadata/v.info.iso/v.info.iso.py
===================================================================
--- grass-addons/grass7/gui/wxpython/wx.metadata/v.info.iso/v.info.iso.py	2015-01-08 17:09:49 UTC (rev 63998)
+++ grass-addons/grass7/gui/wxpython/wx.metadata/v.info.iso/v.info.iso.py	2015-01-08 17:29:44 UTC (rev 63999)
@@ -40,7 +40,7 @@
 from grass.pygrass.utils import get_lib_path
 
 def load_mdlib():
-    path = get_lib_path(modname='wx.metadata', libname='mdgrass')
+    path = get_lib_path(modname='mdlib', libname='mdgrass')
     if path is None:
         fatal("Not able to find the metadata library directory")
     sys.path.append(path)