install wxGUI scripts correctly

d.rast3 renamed to d.rast3d


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@43017 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/scripts/Makefile

@@ -1,17 +1,24 @@
 MODULE_TOPDIR = ../..
 
-include $(MODULE_TOPDIR)/include/Make/Dir.make
+include $(MODULE_TOPDIR)/include/Make/Rules.make
+include $(MODULE_TOPDIR)/include/Make/Vars.make
 include $(MODULE_TOPDIR)/include/Make/Python.make
 
-ETCDIR = $(ETC)/gui/scripts
+SCRIPTDIR = $(ETC)/gui/scripts
 
-SRCFILES := $(wildcard *.py)
-DSTFILES := $(patsubst %,$(ETCDIR)/%,$(SRCFILES)) $(patsubst %.py,$(ETCDIR)/%.pyc,$(filter %.py,$(SRCFILES)))
+ifdef MINGW
+PYFILES := $(patsubst %.py, $(SCRIPTDIR)/%.py, $(filter %.py, $(PY_SOURCES)))
+else
+PYFILES := $(patsubst %.py, $(SCRIPTDIR)/%, $(filter %.py, $(PY_SOURCES)))
+endif
 
-default: $(DSTFILES)
+default: $(PYFILES)
 
-$(ETCDIR)/%: % | $(ETCDIR)
+$(SCRIPTDIR)/%: %.py | $(SCRIPTDIR)
 	$(INSTALL) $< $@
 
-$(ETCDIR):
-	$(MKDIR) $@
+$(SCRIPTDIR)/%.py: %.py | $(SCRIPTDIR)
+	$(INSTALL) $< $@
+
+$(SCRIPTDIR):
+	-test -d $@ | $(MKDIR) $@

gui/scripts/d.rast3.py

@@ -6,19 +6,19 @@
 #
 # AUTHOR(S):    Martin Landa <landa.martin gmail.com>
 #
-# PURPOSE:	Wrapper for wxGUI -- add 3d raster map layer into layer tree
+# PURPOSE:	Wrapper for wxGUI to add 3D raster map into layer tree
 #
-# COPYRIGHT:	(C) 2008 by the GRASS Development Team
+# COPYRIGHT:	(C) 2008, 2010 by the GRASS Development Team
 #
-#		This program is free software under the GNU General Public
-#		License (>=v2). Read the file COPYING that comes with GRASS
-#		for details.
+#		This program is free software under the GNU General
+#		Public License (>=v2). Read the file COPYING that
+#		comes with GRASS for details.
 #
 #############################################################################
 
 #%module
-#%  description: Displays 3d raster data in the active frame on the graphics monitor.
-#%  keywords: display, raster3d
+#% description: Displays 3D raster map layer.
+#% keywords: display, raster3d
 #%end
 
 #%option

include/Make/Python.make

@@ -8,6 +8,8 @@ PYMOD_LDFLAGS := $(SHLIB_LDFLAGS) -L$(ARCH_LIBDIR) $(PYTHONLDFLAGS)
 endif
 PYMOD_CFLAGS = $(SHLIB_CFLAGS) $(PYTHONINC) $(PYTHON_CFLAGS)
 
+PY_SOURCES := $(wildcard *.py)
+
 %.pyc: %.py
 	$(PYTHON) -m py_compile $<