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.

7 files changed, 304 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index d7a717c9..83fb5e99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2002-06-15  Werner LEMBERG  <wl@gnu.org>
+
+	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.
+
+2002-06-14  Bernd Warken  <bwarken@mayn.de>
+
+	* src/roff/grog/Makefile.sub (grog): Renamed to...
+	(grog.old): This.
+	(grog): New rule to always install grog.sh as grog.
+
 2002-06-08  Bernd Warken  <bwarken@mayn.de>
 
 	* src/roff/grog/grog.pl: Fix typo.
diff --git a/Makefile.in b/Makefile.in
index a0d36a13..0abfc4ba 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -189,6 +189,11 @@ man5dir=$(manroot)/man$(man5ext)
 man7ext=7
 man7dir=$(manroot)/man$(man7ext)
 
+# the configure script checks whether all necessary utility programs for
+# grohtml are available -- only then we can build the HTML documentation
+make_html=@make_html@
+make_install_html=@make_install_html@
+
 # DEFINES should include the following:
 # -DHAVE_MMAP			if you have mmap() and <sys/mman.h>
 # -DARRAY_DELETE_NEEDS_SIZE	if your C++ doesn't understand `delete []'
@@ -346,6 +351,8 @@ MDEFINES= \
   "man5dir=$(man5dir)" \
   "man7ext=$(man7ext)" \
   "man7dir=$(man7dir)" \
+  "make_html=$(make_html)" \
+  "make_install_html=$(make_install_html)" \
   "mkinstalldirs=$(mkinstalldirs)" \
   "tmac_wrap=$(tmac_wrap)" \
   "sys_tmac_prefix=$(sys_tmac_prefix)" \
diff --git a/aclocal.m4 b/aclocal.m4
index 4d41ba03..a2c497b0 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -58,6 +58,31 @@ AC_DEFUN(GROFF_PROG_YACC,
 [AC_CHECK_PROGS(YACC, byacc 'bison -y', yacc)])dnl
 dnl
 dnl
+dnl The following programs are needed for grohtml.
+dnl
+AC_DEFUN(GROFF_HTML_PROGRAMS,
+[make_html=html
+make_install_html=install_html
+AC_CHECK_PROG(pnmcut, pnmcut, found, missing)
+AC_CHECK_PROG(pnmcrop, pnmcrop, found, missing)
+AC_CHECK_PROG(pnmtopng, pnmtopng, found, missing)
+AC_CHECK_PROG(gs, gs gsos2, found, missing)
+AC_CHECK_PROG(psselect, psselect, found, missing)
+case "x$pnmcut$pnmcrop$pnmtopng$gs$psselect" in
+*missing*)
+	make_html=
+	make_install_html=
+	AC_MSG_WARN([
+
+  Since one or more of the above five programs can't be found in the path,
+  the HTML backend of groff (grohtml) won't work properly.  Consequently,
+  no documentation in HTML format is built and installed.
+]) ;;
+esac
+AC_SUBST(make_html)
+AC_SUBST(make_install_html)])dnl
+dnl
+dnl
 dnl GROFF_CSH_HACK(if hack present, if not present)
 dnl
 AC_DEFUN(GROFF_CSH_HACK,
diff --git a/configure b/configure
index 49f23629..78c34d44 100755
--- a/configure
+++ b/configure
@@ -5044,6 +5044,191 @@ fi
 echo "$as_me:5044: result: $tmac_wrap" >&5
 echo "${ECHO_T}$tmac_wrap" >&6
 
+make_html=html
+make_install_html=install_html
+# Extract the first word of "pnmcut", so it can be a program name with args.
+set dummy pnmcut; ac_word=$2
+echo "$as_me:5051: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_pnmcut+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$pnmcut"; then
+  ac_cv_prog_pnmcut="$pnmcut" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_pnmcut="found"
+echo "$as_me:5066: found $ac_dir/$ac_word" >&5
+break
+done
+
+  test -z "$ac_cv_prog_pnmcut" && ac_cv_prog_pnmcut="missing"
+fi
+fi
+pnmcut=$ac_cv_prog_pnmcut
+if test -n "$pnmcut"; then
+  echo "$as_me:5075: result: $pnmcut" >&5
+echo "${ECHO_T}$pnmcut" >&6
+else
+  echo "$as_me:5078: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+# Extract the first word of "pnmcrop", so it can be a program name with args.
+set dummy pnmcrop; ac_word=$2
+echo "$as_me:5084: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_pnmcrop+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$pnmcrop"; then
+  ac_cv_prog_pnmcrop="$pnmcrop" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_pnmcrop="found"
+echo "$as_me:5099: found $ac_dir/$ac_word" >&5
+break
+done
+
+  test -z "$ac_cv_prog_pnmcrop" && ac_cv_prog_pnmcrop="missing"
+fi
+fi
+pnmcrop=$ac_cv_prog_pnmcrop
+if test -n "$pnmcrop"; then
+  echo "$as_me:5108: result: $pnmcrop" >&5
+echo "${ECHO_T}$pnmcrop" >&6
+else
+  echo "$as_me:5111: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+# Extract the first word of "pnmtopng", so it can be a program name with args.
+set dummy pnmtopng; ac_word=$2
+echo "$as_me:5117: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_pnmtopng+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$pnmtopng"; then
+  ac_cv_prog_pnmtopng="$pnmtopng" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_pnmtopng="found"
+echo "$as_me:5132: found $ac_dir/$ac_word" >&5
+break
+done
+
+  test -z "$ac_cv_prog_pnmtopng" && ac_cv_prog_pnmtopng="missing"
+fi
+fi
+pnmtopng=$ac_cv_prog_pnmtopng
+if test -n "$pnmtopng"; then
+  echo "$as_me:5141: result: $pnmtopng" >&5
+echo "${ECHO_T}$pnmtopng" >&6
+else
+  echo "$as_me:5144: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+# Extract the first word of "gs gsos2", so it can be a program name with args.
+set dummy gs gsos2; ac_word=$2
+echo "$as_me:5150: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_gs+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$gs"; then
+  ac_cv_prog_gs="$gs" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_gs="found"
+echo "$as_me:5165: found $ac_dir/$ac_word" >&5
+break
+done
+
+  test -z "$ac_cv_prog_gs" && ac_cv_prog_gs="missing"
+fi
+fi
+gs=$ac_cv_prog_gs
+if test -n "$gs"; then
+  echo "$as_me:5174: result: $gs" >&5
+echo "${ECHO_T}$gs" >&6
+else
+  echo "$as_me:5177: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+# Extract the first word of "psselect", so it can be a program name with args.
+set dummy psselect; ac_word=$2
+echo "$as_me:5183: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_psselect+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$psselect"; then
+  ac_cv_prog_psselect="$psselect" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_psselect="found"
+echo "$as_me:5198: found $ac_dir/$ac_word" >&5
+break
+done
+
+  test -z "$ac_cv_prog_psselect" && ac_cv_prog_psselect="missing"
+fi
+fi
+psselect=$ac_cv_prog_psselect
+if test -n "$psselect"; then
+  echo "$as_me:5207: result: $psselect" >&5
+echo "${ECHO_T}$psselect" >&6
+else
+  echo "$as_me:5210: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+case "x$pnmcut$pnmcrop$pnmtopng$gs$psselect" in
+*missing*)
+	make_html=
+	make_install_html=
+	{ echo "$as_me:5218: WARNING:
+
+  Since one or more of the above five programs can't be found in the path,
+  the HTML backend of groff (grohtml) won't work properly.  Consequently,
+  no documentation in HTML format is built and installed.
+" >&5
+echo "$as_me: WARNING:
+
+  Since one or more of the above five programs can't be found in the path,
+  the HTML backend of groff (grohtml) won't work properly.  Consequently,
+  no documentation in HTML format is built and installed.
+" >&2;} ;;
+esac
+
 ac_config_files="$ac_config_files stamp-h"
 
 ac_config_files="$ac_config_files Makefile doc/Makefile src/xditview/Imakefile"
@@ -5127,7 +5312,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:5130: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:5315: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -5300,7 +5485,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:5303: error: ambiguous option: $1
+    { { echo "$as_me:5488: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -5319,7 +5504,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:5322: error: unrecognized option: $1
+  -*) { { echo "$as_me:5507: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -5359,7 +5544,7 @@ do
   "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
   "src/xditview/Imakefile" ) CONFIG_FILES="$CONFIG_FILES src/xditview/Imakefile" ;;
   "src/include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/include/config.h:src/include/config.hin" ;;
-  *) { { echo "$as_me:5362: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:5547: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -5476,6 +5661,13 @@ s,@PAGE@,$PAGE,;t t
 s,@g@,$g,;t t
 s,@sys_tmac_prefix@,$sys_tmac_prefix,;t t
 s,@tmac_wrap@,$tmac_wrap,;t t
+s,@pnmcut@,$pnmcut,;t t
+s,@pnmcrop@,$pnmcrop,;t t
+s,@pnmtopng@,$pnmtopng,;t t
+s,@gs@,$gs,;t t
+s,@psselect@,$psselect,;t t
+s,@make_html@,$make_html,;t t
+s,@make_install_html@,$make_install_html,;t t
 CEOF
 
 EOF
@@ -5590,7 +5782,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:5593: creating $ac_file" >&5
+    { echo "$as_me:5785: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -5608,7 +5800,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:5611: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:5803: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -5621,7 +5813,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:5624: error: cannot find input file: $f" >&5
+           { { echo "$as_me:5816: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -5686,7 +5878,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:5689: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:5881: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -5697,7 +5889,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:5700: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:5892: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -5710,7 +5902,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:5713: error: cannot find input file: $f" >&5
+           { { echo "$as_me:5905: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -5827,7 +6019,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:5830: $ac_file is unchanged" >&5
+      { echo "$as_me:6022: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -5894,7 +6086,7 @@ if test "$no_create" != yes; then
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 
-{ echo "$as_me:5897:
+{ echo "$as_me:6089:
 
   Configuration completed.
 
diff --git a/configure.ac b/configure.ac
index 33c5255c..749840d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,7 @@ GROFF_BROKEN_SPOOLER_FLAGS
 GROFF_PAGE
 GROFF_G
 GROFF_TMAC
+GROFF_HTML_PROGRAMS
 AC_CONFIG_FILES(stamp-h, [echo timestamp > stamp-h])
 AC_CONFIG_FILES([Makefile doc/Makefile src/xditview/Imakefile])
 AC_OUTPUT
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)
diff --git a/src/roff/grog/Makefile.sub b/src/roff/grog/Makefile.sub
index 85e2ad57..d199ac95 100644
--- a/src/roff/grog/Makefile.sub
+++ b/src/roff/grog/Makefile.sub
@@ -3,7 +3,14 @@ CLEANADD=grog
 
 all: grog
 
-grog: grog.pl grog.sh
+grog: grog.sh
+	rm -f $@
+	sed -e "s|@g@|$(g)|g" \
+	  -e "s|@VERSION@|$(version)$(revision)|" \
+	  -e $(SH_SCRIPT_SED_CMD) $(srcdir)/grog.sh >$@
+	chmod +x $@
+
+grog.old: grog.pl grog.sh
 	if test -n "$(PERLPATH)" && test -f "$(PERLPATH)"; then \
 	  rm -f $@; \
 	  sed -e "s|/usr/bin/perl|$(PERLPATH)|" \