[GRASS-SVN] r45799 - grass-addons/gui/wxpython/wx.psmap/docs

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Mar 28 09:30:09 EDT 2011


Author: martinl
Date: 2011-03-28 06:30:09 -0700 (Mon, 28 Mar 2011)
New Revision: 45799

Modified:
   grass-addons/gui/wxpython/wx.psmap/docs/Makefile
Log:
wxGUI/psmap: update docs/Makefile for GRASS7

Modified: grass-addons/gui/wxpython/wx.psmap/docs/Makefile
===================================================================
--- grass-addons/gui/wxpython/wx.psmap/docs/Makefile	2011-03-28 13:15:42 UTC (rev 45798)
+++ grass-addons/gui/wxpython/wx.psmap/docs/Makefile	2011-03-28 13:30:09 UTC (rev 45799)
@@ -1,5 +1,10 @@
 MODULE_TOPDIR = ../../..
 
+ifeq ($(GRASS_VERSION_MAJOR), 7)
+FILES := $(wildcard *.html)
+
+include $(MODULE_TOPDIR)/include/Make/Other.make
+else
 HTML_SOURCES := $(wildcard *.html)
 HTML_FILES := $(filter-out $(wildcard *.tmp.html),$(HTML_SOURCES))
 FILES := $(subst .html,,$(HTML_FILES))
@@ -7,10 +12,15 @@
 include $(MODULE_TOPDIR)/include/Make/Platform.make
 include $(MODULE_TOPDIR)/include/Make/Grass.make
 include $(MODULE_TOPDIR)/include/Make/Rules.make
+endif
 
+ifeq ($(GRASS_VERSION_MAJOR), 7)
+default: $(patsubst %,$(HTMLDIR)/%,$(FILES))
+else
 default:
 	for file in $(FILES) ; do \
 	    rm -f $$file.tmp.html ; \
 	    rm -f "$(GISBASE)/docs/html/$$file.html"; \
 	    $(MAKE) htmldir PGM=$$file; \
 	done
+endif



More information about the grass-commit mailing list