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

[svn_grass at osgeo.org]

Author: glynn
Date: 2011-12-01 00:49:48 -0800 (Thu, 01 Dec 2011)
New Revision: 49455

Modified:
   grass/trunk/include/Make/Html.make
Log:
Revert r48813 to avoid race condition in parallel builds
Declare images as secondary targets to avoid deletion



Modified: grass/trunk/include/Make/Html.make
===================================================================
--- grass/trunk/include/Make/Html.make	2011-12-01 05:59:15 UTC (rev 49454)
+++ grass/trunk/include/Make/Html.make	2011-12-01 08:49:48 UTC (rev 49455)
@@ -12,10 +12,11 @@
 IMGSRC := $(wildcard *.png) $(wildcard *.jpg)
 IMGDST := $(patsubst %,$(HTMLDIR)/%,$(IMGSRC))
 
-$(HTMLDIR)/%.html: %.html %.tmp.html $(HTMLSRC) | $(HTMLDIR)
+$(HTMLDIR)/%.html: %.html %.tmp.html $(HTMLSRC) $(IMGDST) | $(HTMLDIR)
 	$(PYTHON) $(GISBASE)/tools/mkhtml.py $* $(GRASS_VERSION_DATE) > $@
+
 ifneq ($(strip $(IMGDST)),)
-	$(MAKE) $(IMGDST)
+.SECONDARY: $(IMGDST)
 endif
 
 $(HTMLDIR)/%.png: %.png | $(HTMLDIR)