浏览代码

don't hardcode python.exe, install helper script in correct dir

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

+ 3 - 2
general/g.mapsets/Makefile

@@ -2,7 +2,7 @@
 MODULE_TOPDIR = ../..
 
 PGM = g.mapsets
-GUI = $(ETC)/gui/g.mapsets.py
+GUI = $(ETC)/gui/scripts/g.mapsets.py
 
 LIBES     = $(GISLIB)
 DEPENDENCIES= $(GISDEP)
@@ -11,7 +11,8 @@ include $(MODULE_TOPDIR)/include/Make/Module.make
 
 default: cmd $(GUI)
 
-$(ETC)/gui/%: %
+$(ETC)/gui/scripts/%: %
 	if [ ! -d $(ETC) ]; then $(MKDIR) $(ETC); fi
 	if [ ! -d $(ETC)/gui ]; then $(MKDIR) $(ETC)/gui; fi
+	if [ ! -d $(ETC)/gui/scripts ]; then $(MKDIR) $(ETC)/gui/scripts; fi
 	$(INSTALL) $< $@

+ 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/g.mapsets.py", G_gisbase());
-	G_spawn("python", "g.mapsets.py", path, NULL);
+	sprintf(path, "%s/etc/gui/scripts/g.mapsets.py", G_gisbase());
+	G_spawn(getenv("GRASS_PYTHON"), "g.mapsets.py", path, NULL);
     }
 
     if (opt.mapset->answer) {