Fix handling of image files, esp. for parallel make

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

include/Make/Html.make

@@ -10,14 +10,10 @@ else
 htmldesc = $(call run_grass,$(1) --html-description < /dev/null | grep -v '</body>\|</html>' > $(2))
 
 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 $(IMGSRC)),)
-	if test -n "$(IMGSRC)" ; then \
-		$(MAKE) $(patsubst %,$(HTMLDIR)/%,$(IMGSRC)) ; \
-	fi
-endif
 
 $(HTMLDIR)/%.png: %.png | $(HTMLDIR)
 	$(INSTALL_DATA) $< $@

raster/Makefile

@@ -137,3 +137,9 @@ default:
 	$(MAKE) htmldir 
 
 htmldir: parsubdirs
+
+$(HTMLDIR)/r.in.png:
+	# no-op - override Html.make rule for .png image files
+
+$(HTMLDIR)/r.out.png:
+	# no-op - override Html.make rule for .png image files