Merged patches 4858 4860 and 4861 from release/1.0

[[Imported from SVN: r4862]]

doc/doxygen/Makefile.am

@@ -80,8 +80,8 @@ html-dist: $(DOXYGENHEADERBUILD)
 	  echo Running doxygen. This may take a while... ; \
 	  $(DOXYGEN) Doxyfile.tmp > doxygen.log 2>&1 <&- ; \
 	  rm -f Doxyfile.tmp; \
-	fi; \
-	mv html html-dist
+	fi
+	if test -d html; then rm -rf html-dist; mv html html-dist; fi
 
 # how to install the doxygen documentation
 doxygen-install:
@@ -100,7 +100,8 @@ FORCE:
 include $(top_srcdir)/am/webstuff
 
 clean-local:
-	rm -rf html html-dist latex *~
+	if test -e Doxydep; then rm -rf html html-dist; fi
+	rm -rf latex *~
 
 CLEANFILES = $(WHAT) $(DOXYGENTAG) $(DOXYGENHEADER)