[GRASS-SVN] r54522 - grass/trunk/include/Make
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Jan 4 03:23:42 PST 2013
Author: martinl
Date: 2013-01-04 03:23:41 -0800 (Fri, 04 Jan 2013)
New Revision: 54522
Modified:
grass/trunk/include/Make/GuiScript.make
Log:
fix GuiScript for wingrass
Modified: grass/trunk/include/Make/GuiScript.make
===================================================================
--- grass/trunk/include/Make/GuiScript.make 2013-01-03 22:47:55 UTC (rev 54521)
+++ grass/trunk/include/Make/GuiScript.make 2013-01-04 11:23:41 UTC (rev 54522)
@@ -2,6 +2,13 @@
# common dependencies and rules for building GUI module
include $(MODULE_TOPDIR)/include/Make/Vars.make
+
+ifdef MINGW
+SCRIPTEXT = .py
+else
+SCRIPTEXT =
+endif
+
include $(MODULE_TOPDIR)/include/Make/Rules.make
include $(MODULE_TOPDIR)/include/Make/ScriptRules.make
include $(MODULE_TOPDIR)/include/Make/HtmlRules.make
@@ -9,7 +16,7 @@
MODULES := $(patsubst g.gui.%.py,%,$(wildcard g.gui.*.py))
CMDHTML := $(patsubst %,$(HTMLDIR)/g.gui.%.html,$(MODULES))
GUIHTML := $(patsubst %,$(HTMLDIR)/wxGUI.%.html,$(MODULES))
-PYFILES := $(patsubst %,$(SCRIPTDIR)/g.gui.%,$(MODULES))
+PYFILES := $(patsubst %,$(SCRIPTDIR)/g.gui.%$(SCRIPTEXT),$(MODULES))
guiscript: $(IMGDST) $(PYFILES)
$(MAKE) $(CMDHTML)
@@ -26,7 +33,7 @@
g.gui.%.tmp.html: $(SCRIPTDIR)/g.gui.%
$(call htmldesc,$<,$@)
-$(SCRIPTDIR)/g.gui.%: g.gui.%.py | $(SCRIPTDIR)
+$(SCRIPTDIR)/g.gui.%$(SCRIPTEXT): g.gui.%.py | $(SCRIPTDIR)
$(INSTALL) $< $@
.PHONY: guiscript
More information about the grass-commit
mailing list