[GRASS-SVN] r35437 - grass/trunk/include/Make

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Jan 16 05:36:35 EST 2009


Author: glynn
Date: 2009-01-16 05:36:35 -0500 (Fri, 16 Jan 2009)
New Revision: 35437

Modified:
   grass/trunk/include/Make/Html.make
Log:
Allow for Windows/MSys when setting PYTHONPATH


Modified: grass/trunk/include/Make/Html.make
===================================================================
--- grass/trunk/include/Make/Html.make	2009-01-16 10:35:15 UTC (rev 35436)
+++ grass/trunk/include/Make/Html.make	2009-01-16 10:36:35 UTC (rev 35437)
@@ -11,11 +11,17 @@
 	GISRC=$(RUN_GISRC) \
 	GISBASE=$(RUN_GISBASE) \
 	PATH="$(BIN):$$PATH" \
-	PYTHONPATH="$(GISBASE)/etc/python:$$PYTHONPATH" \
+	PYTHONPATH="$(call mkpath,$(GISBASE)/etc/python,$$PYTHONPATH)" \
 	$(LD_LIBRARY_PATH_VAR)="$(BIN):$(ARCH_LIBDIR):$($(LD_LIBRARY_PATH_VAR))" \
 	LC_ALL=C \
 	$(1) --html-description < /dev/null | grep -v '</body>\|</html>' > $(2)
 
+ifneq ($(MINGW32),)
+mkpath = $(shell g.dirseps -h $(1))\;$(2)
+else
+mkpath = $(1):$(2)
+endif
+
 $(HTMLDIR)/%.html: %.html %.tmp.html $(HTMLSRC)
 	-test -d $(HTMLDIR) || $(MKDIR) $(HTMLDIR)
 	$(MODULE_TOPDIR)/tools/mkhtml.sh $* > $@



More information about the grass-commit mailing list