浏览代码

avoid namespace collision on MS-Windows

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@37167 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman 16 年之前
父节点
当前提交
6351c049bb
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      general/g.mapsets/Makefile
  2. 0 0
      general/g.mapsets/g.mapsets_picker.py
  3. 2 2
      general/g.mapsets/main.c

+ 1 - 1
general/g.mapsets/Makefile

@@ -2,7 +2,7 @@
 MODULE_TOPDIR = ../..
 
 PGM = g.mapsets
-GUI = $(ETC)/gui/scripts/g.mapsets.py
+GUI = $(ETC)/gui/scripts/g.mapsets_picker.py
 
 LIBES     = $(GISLIB)
 DEPENDENCIES= $(GISDEP)

general/g.mapsets/g.mapsets.py → general/g.mapsets/g.mapsets_picker.py


+ 2 - 2
general/g.mapsets/main.c

@@ -113,8 +113,8 @@ int main(int argc, char *argv[])
     }
 
     if (opt.dialog->answer) {
-	sprintf(path, "%s/etc/gui/scripts/g.mapsets.py", G_gisbase());
-	G_spawn(getenv("GRASS_PYTHON"), "g.mapsets.py", path, NULL);
+	sprintf(path, "%s/etc/gui/scripts/g.mapsets_picker.py", G_gisbase());
+	G_spawn(getenv("GRASS_PYTHON"), "g.mapsets_picker.py", path, NULL);
     }
 
     if (opt.mapset->answer) {