Don't produce HTML files if utility programs are missing.

* Makefile.in (make_html, make_install_html): New variables.
(MDEFINES): Updated.

* aclocal.m4 (GROFF_HTML_PROGRAMS): New function to test for HTML
utility programs.
* configure.ac: Use it.
* configure: Regenerated.

* doc/Makefile.sub (PROCESSEDEXAMPLEFILES): Move webpage.html to...
(HTMLEXAMPLESFILES): This new variable.
(EXAMPLESIMAGEFILES): Renamed to...
(HTMLEXAMPLEIMAGEFILES): This.
(CLEANADD): Add HTMLEXAMPLEFILES.
(all): Use `make_html'.
(html): New target.
(install_data): Use `make_install_html'.
Move html stuff to...
(install_html): This new target.
(uninstall_sub): Updated.

1 files changed, 29 insertions, 17 deletions

diff --git a/doc/Makefile.sub b/doc/Makefile.sub
index 4cd96699..ecc83ae1 100644
--- a/doc/Makefile.sub
+++ b/doc/Makefile.sub
@@ -38,10 +38,11 @@ groff_bin_path=`echo $(groff_bin_dirs) | sed -e 's| \+|:|g'`
 FFLAG=-F$(top_builddir)/font -F$(top_srcdir)/font
 TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac
 
-GROFF=GROFF_BIN_PATH=$(groff_bin_path); \
-      export GROFF_BIN_PATH; \
-      sed -e "s;@VERSION@;$(version)$(revision);" $< \
-      | $(top_builddir)/src/roff/groff/groff $(TFLAG) $(FFLAG) -Upet -ww
+GROFF=\
+  GROFF_BIN_PATH=$(groff_bin_path); \
+  export GROFF_BIN_PATH; \
+  sed -e "s;@VERSION@;$(version)$(revision);" $< \
+  | $(top_builddir)/src/roff/groff/groff $(TFLAG) $(FFLAG) -Upet -ww
 
 DOCFILES=\
   meref.me \
@@ -66,12 +67,14 @@ EXAMPLEFILES=\
 
 PROCESSEDEXAMPLEFILES=\
   webpage.ps \
-  webpage.html \
   gnu.eps \
   gnu.png \
   grnexmpl.ps
 
-EXAMPLEIMAGEFILES=\
+HTMLEXAMPLEFILES=\
+  webpage.html
+
+HTMLEXAMPLEIMAGEFILES=\
   webpage*
 
 imagedir=img
@@ -81,6 +84,7 @@ exampleimagedir=$(exampledir)/$(imagedir)
 CLEANADD=\
   $(PROCESSEDDOCFILES) \
   $(PROCESSEDEXAMPLEFILES) \
+  $(HTMLEXAMPLEFILES) \
   $(HTMLDOCFILES)
 
 CLEANDIRADD=\
@@ -105,7 +109,9 @@ CLEANNOTSRCDIRADD=\
 
 
 all: groff $(PROCESSEDDOCFILES) prepare_examples \
-     $(PROCESSEDEXAMPLEFILES) $(HTMLDOCFILES)
+     $(PROCESSEDEXAMPLEFILES) $(make_html)
+
+html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES)
 
 prepare_examples: grnexmpl.g
 	test -f grnexmpl.g || cp $(srcdir)/grnexmpl.g .
@@ -123,10 +129,9 @@ webpage.ps: gnu.eps
 
 grnexmpl.ps: grnexmpl.me grnexmpl.g
 
-
 distfiles: groff
 
-install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(HTMLDOCFILES) \
+install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \
               $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
 	-test -d $(infodir) || $(mkinstalldirs) $(infodir)
 # Prefer info files in builddir over srcdir; we test for
@@ -147,6 +152,17 @@ install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(HTMLDOCFILES) \
 	  rm -f $(docdir)/$$f; \
 	  $(INSTALL_DATA) $$f $(docdir)/$$f; \
 	done
+	-test -d $(exampledir) || $(mkinstalldirs) $(exampledir)
+	for f in $(EXAMPLEFILES); do \
+	  rm -f $(exampledir)/$$f; \
+	  $(INSTALL_DATA) $(srcdir)/$$f $(exampledir)/$$f; \
+	done
+	for f in $(PROCESSEDEXAMPLEFILES); do \
+	  rm -f $(exampledir)/$$f; \
+	  $(INSTALL_DATA) $$f $(exampledir)/$$f; \
+	done
+
+install_html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES)
 	-test -d $(htmldocdir) || $(mkinstalldirs) $(htmldocdir)
 	for f in $(HTMLDOCFILES); do \
 	  rm -f $(htmldocdir)/$$f; \
@@ -156,17 +172,13 @@ install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(HTMLDOCFILES) \
 	rm -f $(htmldocimagedir)/$(HTMLDOCIMAGEFILES)
 	$(INSTALL_DATA) $(imagedir)/$(HTMLDOCIMAGEFILES) $(htmldocimagedir)
 	-test -d $(exampledir) || $(mkinstalldirs) $(exampledir)
-	for f in $(EXAMPLEFILES); do \
-	  rm -f $(exampledir)/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(exampledir)/$$f; \
-	done
-	for f in $(PROCESSEDEXAMPLEFILES); do \
+	for f in $(HTMLEXAMPLEFILES); do \
 	  rm -f $(exampledir)/$$f; \
 	  $(INSTALL_DATA) $$f $(exampledir)/$$f; \
 	done
 	-test -d $(exampleimagedir) || $(mkinstalldirs) $(exampleimagedir)
-	rm -f $(exampleimagedir)/$(EXAMPLEIMAGEFILES)
-	$(INSTALL_DATA) $(imagedir)/$(EXAMPLEIMAGEFILES) $(exampleimagedir)
+	rm -f $(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES)
+	$(INSTALL_DATA) $(imagedir)/$(HTMLEXAMPLEIMAGEFILES) $(exampleimagedir)
 
 uninstall_sub:
 	-for f in groff groff-*; do \
@@ -184,5 +196,5 @@ uninstall_sub:
 	-for f in $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES); do \
 	  rm -f $(exampledir)/$$f; \
 	done
-	-rm -f $(exampleimagedir)/$(EXAMPLEIMAGEFILES)
+	-rm -f $(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES)
 	-rmdir $(exampleimagedir)