[groff] 01/01: [configure] Delete the --with-doc option.

[Ingo Schwarze]

schwarze pushed a commit to branch master
in repository groff.

commit 3805d2a0e4aebb84d896f86285fd565488e849bb
Author: Ingo Schwarze <schwarze@openbsd.org>
AuthorDate: Tue Apr 12 14:36:12 2022 +0200

    [configure] Delete the --with-doc option.
    
    This option was harmful, ill-designed, buggy, and essentially
    unmaintained and untested.  For more details on the rationale,
    see the NEWS file.
    
    OK gbranden@ and no objection when shown on groff at gnu dot org.
---
 ChangeLog               |  18 +++++++
 Makefile.am             |  29 -----------
 NEWS                    |  20 ++++++++
 configure.ac            |  13 -----
 contrib/chem/ChangeLog  |   8 +++
 contrib/chem/chem.am    |   6 ---
 contrib/hdtbl/ChangeLog |   8 +++
 contrib/hdtbl/hdtbl.am  |   8 +--
 contrib/mom/ChangeLog   |   9 ++++
 contrib/mom/mom.am      |  10 +---
 doc/doc.am              |  18 ++-----
 m4/groff.m4             | 134 +++---------------------------------------------
 12 files changed, 76 insertions(+), 205 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 03a85e86..74734703 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2022-04-12  Ingo Schwarze <schwarze@openbsd.org>
+
+       Delete the harmful, ill-designed, buggy, and essentially
+       unmaintained and untested --with-doc option of the configure
+       script.
+
+       * configure.ac: Delete five AM_CONDITIONAL variables, one
+       autoconf(1) macro call, and some related diagnostic output.
+       * doc/doc.am: Delete two BUILD_EXAMPLES and one BUILD_OTHERDOC
+       conditional and use BUILD_HTML instead of BUILD_HTMLEXAMPLES.
+       * m4/groff.m4: Delete the GROFF_DOC_CHECK macro and simplify the
+       macros GROFF_HTML_PROGRAMS, GROFF_INSTALL_INFO, GROFF_MAKEINFO,
+       and GROFF_PDFDOC_PROGRAMS.  This also deletes more than thirty
+       configuration variables.
+       * Makefile.am: Delete comments about 16 variables that are no
+       longer set.
+       * NEWS: Add details regarding the rationale.
+
 2022-04-12  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * src/preproc/preconv/preconv.cpp (unicode_entity): Convert
diff --git a/Makefile.am b/Makefile.am
index b9601568..76fb26d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -308,47 +308,18 @@ man5dir=$(manroot)/man$(man5ext)
 man7ext=7
 man7dir=$(manroot)/man$(man7ext)
 
-# doc_dist_target_ok
-# `dist' target is disallowed in some `configure' combinations.
-
-# The configure script checks whether the user wants the info documentation.
-# For the repo version this mechanism also suppresses building via `makeinfo'.
-# make_infodoc
-# make_install_infodoc
-# make_uninstall_infodoc
-
 # The configure script checks whether all necessary utility programs for
 # grohtml are available -- only then can we build the HTML documentation.
 # make_htmldoc
 # make_install_htmldoc
 # make_uninstall_htmldoc
 
-# make_htmlexamples
-# make_install_htmlexamples
-# make_uninstall_htmlexamples
-
 # The configure script also checks whether all necessary utility programs
 # for pdfroff are available -- only then can we build PDF documentation.
 # make_pdfdoc
 # make_install_pdfdoc
 # make_uninstall_pdfdoc
 
-# make_pdfexamples
-# make_install_pdfexamples
-# make_uninstall_pdfexamples
-
-# `other' documentation, e.g., `meref.me' and `pic.ms', as well as their
-# generated counterparts..
-# make_otherdoc
-# make_install_otherdoc
-# make_uninstall_otherdoc
-
-# `examples' -- a generic switch, but the generated examples are further
-# subdivided to catch HTML and PDF production availability.
-# make_examples
-# make_install_examples
-# make_uninstall_examples
-
 # Windows `.cmd' files
 # make_winscripts
 # make_install_winscripts
diff --git a/NEWS b/NEWS
index 33085833..db987046 100644
--- a/NEWS
+++ b/NEWS
@@ -420,6 +420,26 @@ o The semantics of the environment variable 
SOURCE_DATE_EPOCH (support
 o xtotroff now supports a "-d" option to specify the directory in which
   to generate font description files.
 
+o The 'configure' option --with-doc that was introduced in version
+  1.22.3 has been deleted again.  Its basic idea was misguided because
+  each of the documents is only available in a subset of the output
+  formats, so in contrast to the documentation, the option not only
+  affected which output formats were generated, but also restricted the
+  documentation content the user would get in erratic and surprising
+  ways.  The option was also ill-designed in so far as the "examples"
+  keyword did not represent an output format.  Some example files were
+  controlled by the "examples" keyword alone, some by the respective
+  format keywords alone, and some by a combination of both.  The
+  implementation of the option was full of bugs, but few, if any, of
+  these bugs were ever reported by users, giving the impression that
+  few, if any, users ever attempted to use the option, and those who
+  did likely remained unaware that doing so deprived them of parts of
+  the content of the documentation.  Experience has demonstrated that
+  properly maintaining and testing the option exceeds the amount of
+  effort the GNU troff team is able to invest.  Finally, GNU standards
+  contain no recommendation to support this option, and indeed, few, if
+  any, GNU packages apart from groff support it.
+
 o groffer has been deleted from the distribution.
 
 o grog no longer supports the "--warnings" option; the one diagnostic
diff --git a/configure.ac b/configure.ac
index e205fca7..1ea4c377 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,6 @@ GROFF_PRINT
 GROFF_REFERDIR_DEFAULT
 AC_PROG_EGREP
 GROFF_PROG_YACC
-GROFF_DOC_CHECK
 GROFF_MAKEINFO
 GROFF_TEXI2DVI
 AC_PROG_RANLIB
@@ -198,13 +197,8 @@ AM_CONDITIONAL([MAKE_DONT_HAVE_RM], [test 
"x$groff_is_rm_defined" = "xno"])
 AM_CONDITIONAL([USEPROGRAMPREFIX], [test x$g = xg])
 
 AM_CONDITIONAL([BUILD_HTML], [test -n "$make_htmldoc"])
-AM_CONDITIONAL([BUILD_HTMLEXAMPLES], [test -n "$make_htmlexamples"])
 AM_CONDITIONAL([BUILD_PDFDOC], [test -n "$make_pdfdoc"])
-AM_CONDITIONAL([BUILD_PDFEXAMPLES], [test -n "$make_pdfexamples"])
-AM_CONDITIONAL([BUILD_OTHERDOC], [test -n "$make_otherdoc"])
-AM_CONDITIONAL([BUILD_EXAMPLES], [test -n "$make_examples"])
 AM_CONDITIONAL([USE_GROFF_ALLOCATOR], [test "x$use_groff_allocator" = "xyes"])
-AM_CONDITIONAL([INSTALL_SHIPPED_HTML], [test -n 
"$make_install_shipped_htmldoc"])
 AM_CONDITIONAL([HAVE_PDFTOOLS], [test "x$groff_have_pdftools" = "xyes" ])
 AM_CONDITIONAL([HAVE_TEXI2DVI], [test "x$groff_have_texi2dvi" = "xyes" ])
 
@@ -232,13 +226,6 @@ echo "\
  X11 support                     : yes
  X11 resources dir               : $appresdir"
 fi
-if test "x$doc" = x; then
-echo "\
- Doc build                       : no"
-else
-echo "\
- Doc build                       : ${doc} "
-fi
 echo "\
  URW fonts for pdf               : $groff_have_urw_fonts
  Use uchardet library for preconv: $groff_have_uchardet
diff --git a/contrib/chem/ChangeLog b/contrib/chem/ChangeLog
index 7f857757..e40f5dfa 100644
--- a/contrib/chem/ChangeLog
+++ b/contrib/chem/ChangeLog
@@ -1,3 +1,11 @@
+2022-04-12  Ingo Schwarze <schwarze@openbsd.org>
+
+       Delete the harmful, ill-designed, buggy, and essentially
+       unmaintained and untested --with-doc option of the configure
+       script.  See the NEWS file for more details on the rationale.
+
+       * chem.am: Delete three BUILD_EXAMPLES conditionals.
+
 2020-04-22  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * chem.1.man:
diff --git a/contrib/chem/chem.am b/contrib/chem/chem.am
index 148ae171..01d82db4 100644
--- a/contrib/chem/chem.am
+++ b/contrib/chem/chem.am
@@ -38,7 +38,6 @@ CHEM_EXAMPLES =  \
   contrib/chem/examples/penicillin.chem \
   contrib/chem/examples/reserpine.chem
 
-if BUILD_EXAMPLES
 # Files installed in $(exampledir)/chem
 chemexampledir = $(exampledir)/chem
 nodist_chemexample_DATA = $(CHEM_GENEXAMPLES)
@@ -48,7 +47,6 @@ dist_chemexample_DATA = $(CHEM_EXAMPLES)
 # lazily installed by the local install target
 chemexample122dir = $(chemexampledir)/122
 nodist_chemexample122_DATA = contrib/chem/examples/122/README
-endif
 EXTRA_DIST += \
   contrib/chem/ChangeLog \
   contrib/chem/chem.1.man \
@@ -92,23 +90,19 @@ chem: $(chem_srcdir)/chem.pl $(SH_DEPS_SED_SCRIPT)
 
 install-data-local: install_chem_extra
 install_chem_extra:
-if BUILD_EXAMPLES
        -test -d $(DESTDIR)$(chemexample122dir) \
           || $(mkinstalldirs) $(DESTDIR)$(chemexample122dir);
        for i in $(chem_srcdir)/examples/122/*.chem; do \
          n=`echo $$i | sed 's|$(chem_srcdir)/examples/122/||g'`; \
          $(INSTALL_DATA) $$i $(DESTDIR)$(chemexample122dir)/$$n; \
        done
-endif
 
 uninstall-local: uninstall_chem_extra
 uninstall_chem_extra:
-if BUILD_EXAMPLES
        $(RM) $(DESTDIR)$(exampledir)/chem/122/*
        -rmdir $(DESTDIR)$(exampledir)/chem/122
        $(RM) $(DESTDIR)$(exampledir)/chem/*
        -rmdir $(DESTDIR)$(exampledir)/chem
-endif
        -rmdir $(DESTDIR)$(datasubdir)/pic
 
 dist-hook: dist_chem
diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog
index 12de4fec..a66ef761 100644
--- a/contrib/hdtbl/ChangeLog
+++ b/contrib/hdtbl/ChangeLog
@@ -1,3 +1,11 @@
+2022-04-12  Ingo Schwarze <schwarze@openbsd.org>
+
+       Delete the harmful, ill-designed, buggy, and essentially
+       unmaintained and untested --with-doc option of the configure
+       script.  See the NEWS file for more details on the rationale.
+
+       * hdtbl.am: Delete two BUILD_EXAMPLES conditionals.
+
 2022-03-30  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * hdtbl.am: Eliminate `HDTBL_TFLAG` and `HDTBL_PFLAG` Make
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index 2c10dc6a..19af0ea2 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -75,16 +75,12 @@ HDTBLPROCESSEDEXAMPLEFILES = \
   contrib/hdtbl/examples/short_reference.ps
 
 hdtblexampledir = $(exampledir)/hdtbl
-
-if BUILD_EXAMPLES
 dist_hdtblexample_DATA = $(HDTBLEXAMPLEFILES)
 nodist_hdtblexample_DATA = \
   $(HDTBLGENFILES) \
   $(HDTBLPROCESSEDEXAMPLEFILES) \
   $(DOC_GNU_EPS)
-else
-EXTRA_DIST += $(HDTBLEXAMPLEFILES)
-endif
+
 $(hdtblexample_DATA): $(HDTBLTMACFILES)
 
 MOSTLYCLEANFILES += $(HDTBLGENFILES) $(HDTBLPROCESSEDEXAMPLEFILES)
@@ -94,7 +90,6 @@ EXTRA_DIST += \
   contrib/hdtbl/TODO \
   contrib/hdtbl/groff_hdtbl.7.man
 
-if BUILD_EXAMPLES
 hdtbl_TESTS = contrib/hdtbl/examples/test-hdtbl.sh
 TESTS += $(hdtbl_TESTS)
 contrib/hdtbl/examples/test-hdtbl.sh: \
@@ -107,7 +102,6 @@ contrib/hdtbl/examples/test-hdtbl.sh: \
          $(top_srcdir)/$(hdtbl_test_template) > $@ \
        && chmod +x $@
 MOSTLYCLEANFILES += $(hdtbl_TESTS)
-endif
 
 # Rule to generate ps and roff files
 SUFFIXES += .roff .in .ps
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index f50b60f4..3750bf75 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,12 @@
+2022-04-12  Ingo Schwarze <schwarze@openbsd.org>
+
+       Delete the harmful, ill-designed, buggy, and essentially
+       unmaintained and untested --with-doc option of the configure
+       script.  See the NEWS file for more details on the rationale.
+
+       * mom.am: Delete one INSTALL_SHIPPED_HTML and one BUILD_EXAMPLES
+       conditional and use BUILD_PDFDOC instead of BUILD_PDFEXAMPLES.
+
 2021-03-29  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * mom.am: Eliminate `MOM_TFLAG` and `MOM_PFLAG` Make macros;
diff --git a/contrib/mom/mom.am b/contrib/mom/mom.am
index d566c1ce..0689df8c 100644
--- a/contrib/mom/mom.am
+++ b/contrib/mom/mom.am
@@ -38,7 +38,6 @@ momtmacdir = $(tmacdir)
 dist_momtmac_DATA = $(MOMNORMALFILES)
 
 # Files installed in htmldocdir/mom
-if INSTALL_SHIPPED_HTML
 MOMHTMLDOCFILES=\
   contrib/mom/momdoc/stylesheet.css \
   contrib/mom/momdoc/appendices.html \
@@ -65,7 +64,6 @@ MOMHTMLDOCFILES=\
   contrib/mom/momdoc/version-2.html
 momhtmldir = $(htmldocdir)/mom
 momhtml_DATA = $(MOMHTMLDOCFILES)
-endif
 
 # Files installed in $(examplesdir)/mom.  MOMEXAMPLEFILES are located
 # in the source tree, while MOMPROCESSEDEXAMPLEFILES are generated in
@@ -86,14 +84,10 @@ MOMEXAMPLEFILES=\
   contrib/mom/examples/slide-demo.mom \
   contrib/mom/examples/copyright-default.mom \
   contrib/mom/examples/copyright-chapter.mom
-if BUILD_EXAMPLES
 momexampledir = $(exampledir)/mom
 dist_momexample_DATA = $(MOMEXAMPLEFILES)
-else
-EXTRA_DIST += $(MOMEXAMPLEFILES)
-endif
 
-if BUILD_PDFEXAMPLES
+if BUILD_PDFDOC
 MOMPROCESSEDEXAMPLEFILES = \
   contrib/mom/examples/letter.pdf \
   contrib/mom/examples/mom-pdf.pdf \
@@ -159,7 +153,7 @@ penguin.pdf:
 
 install-data-hook: install_mom
 install_mom:
-if BUILD_PDFEXAMPLES
+if BUILD_PDFDOC
        for f in $(PDFDOCFILE); do \
          $(RM) $(DESTDIR)$(pdfdocdir)/$$f; \
          ln -s $(exampledir)/mom/$$f $(DESTDIR)$(pdfdocdir)/$$f; \
diff --git a/doc/doc.am b/doc/doc.am
index f55fe1ed..93436783 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -42,7 +42,6 @@ DOC_GROFF=\
 DOC_GNU_EPS=doc/gnu.eps
 
 # Other doc, installed in $(docdir)
-if BUILD_OTHERDOC
 # Files located in the source tree
 DOCFILES_INST= \
   doc/me-revisions \
@@ -73,9 +72,6 @@ otherdocdir = $(docdir)
 dist_otherdoc_DATA = $(DOCFILES_INST) $(GENERATEDDOCFILES)
 nodist_otherdoc_DATA = $(PROCESSEDDOCFILES)
 MOSTLYCLEANFILES += $(GENERATEDDOCFILES) $(PROCESSEDDOCFILES)
-else
-EXTRA_DIST += $(DOCFILES_INST) $(GENERATEDDOCFILES)
-endif
 EXTRA_DIST += $(DOCFILES_NOINST)
 
 # pdf doc, written in mom and therefore using contrib/mom/mom.am
@@ -110,7 +106,6 @@ EXAMPLEFILES = \
   doc/grnexmpl.g \
   doc/grnexmpl.me
 
-if BUILD_EXAMPLES
 # Generated in the build tree
 PROCESSEDEXAMPLEFILES = \
   doc/webpage.ps \
@@ -119,11 +114,8 @@ docexamplesdir = $(exampledir)
 dist_docexamples_DATA = $(EXAMPLEFILES)
 nodist_docexamples_DATA = $(PROCESSEDEXAMPLEFILES)
 MOSTLYCLEANFILES += $(PROCESSEDEXAMPLEFILES)
-else
-EXTRA_DIST += $(EXAMPLEFILES)
-endif
 
-if BUILD_HTMLEXAMPLES
+if BUILD_HTML
 # webpage.html is generated; webpage*.html files are installed by the
 # local rule.
 HTMLEXAMPLEFILES = doc/webpage.html
@@ -383,7 +375,7 @@ endif
        if test $(top_builddir) != $(top_srcdir); then \
          $(RM) $(top_builddir)/doc/groff.css; \
        fi
-if BUILD_HTMLEXAMPLES
+if BUILD_HTML
        if test -d $(doc_builddir); then \
          cd $(doc_builddir) \
          && for f in $(HTMLEXAMPLEFILESALL); do \
@@ -427,7 +419,7 @@ install_doc_gnu_eps: $(DOC_GNU_EPS)
        done
 
 install_doc_examples: $(DOC_GNU_EPS)
-if BUILD_HTMLEXAMPLES
+if BUILD_HTML
        cd $(doc_builddir) \
        && for f in `ls $(HTMLEXAMPLEFILESALL)`; do \
          $(RM) $(DESTDIR)$(exampledir)/$$f; \
@@ -444,10 +436,8 @@ endif
 uninstall-hook: \
   uninstall_doc_examples uninstall_doc_htmldoc uninstall_mom
 uninstall_doc_examples:
-if BUILD_EXAMPLES
        $(RM) $(DESTDIR)$(exampledir)/gnu.eps
-endif
-if BUILD_HTMLEXAMPLES
+if BUILD_HTML
        -test -d $(DESTDIR)$(docexamplesdir) \
        && cd $(DESTDIR)$(docexamplesdir) \
        && for f in $(HTMLEXAMPLEFILESALL); do \
diff --git a/m4/groff.m4 b/m4/groff.m4
index 50077e71..f33736cb 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -75,83 +75,6 @@ AC_DEFUN([GROFF_PERL],
      AC_MSG_ERROR([perl version is too old], 1))])
 
 
-# It is possible to fine-tune generation of documentation.
-
-AC_DEFUN([GROFF_DOC_CHECK],
-  [AC_ARG_WITH([doc],
-    [AS_HELP_STRING([--with-doc[[=TYPE]]],
-      [choose which manuals (beside man pages) are desirable. \
-       TYPE can be 'yes' or 'no', or a comma-separated list of \
-       one or multiple of 'html', 'info', 'other', 'pdf', and \
-       'examples', to restrict what is produced])],
-    [doc="$withval"],
-    [doc=yes])
-  test "$doc" = no && doc=''
-  if test "$doc" = yes; then
-    doc_dist_target_ok=yes
-    docadd_html=yes
-    docadd_info=yes
-    docadd_other=yes
-    docadd_pdf=yes
-    docadd_examples=yes
-  else
-    # Don't use case/esac, verify input.
-    doc_dist_target_ok=no
-    docadd_html=no
-    docadd_info=no
-    docadd_other=no
-    docadd_pdf=no
-    docadd_examples=no
-    OFS=$IFS
-    IFS=','
-    set -- $doc
-    IFS=$OFS
-    for i
-    do
-      test "$i" = html     && { docadd_html=yes; continue; }
-      test "$i" = info     && { docadd_info=yes; continue; }
-      test "$i" = other    && { docadd_other=yes; continue; }
-      test "$i" = pdf      && { docadd_pdf=yes; continue; }
-      test "$i" = examples && { docadd_examples=yes; continue; }
-      AC_MSG_WARN([Invalid '--with-doc' argument:] $i)
-    done
-  fi
-  if test $docadd_html = yes; then
-    make_install_shipped_htmldoc=install_shipped_htmldoc
-    make_uninstall_shipped_htmldoc=uninstall_shipped_htmldoc
-  else
-    make_install_shipped_htmldoc=
-    make_uninstall_shipped_htmldoc=
-  fi
-  if test $docadd_other = yes; then
-    make_otherdoc=otherdoc
-    make_install_otherdoc=install_otherdoc
-    make_uninstall_otherdoc=uninstall_otherdoc
-  else
-    make_otherdoc=
-    make_install_otherdoc=
-    make_uninstall_otherdoc=
-  fi
-  if test "$docadd_examples" = yes; then
-    make_examples=examples
-    make_install_examples=install_examples
-    make_uninstall_examples=uninstall_examples
-  else
-    make_examples=
-    make_install_examples=
-    make_uninstall_examples=
-  fi
-  AC_SUBST([doc_dist_target_ok])
-  AC_SUBST([make_install_shipped_htmldoc])
-  AC_SUBST([make_uninstall_shipped_htmldoc])
-  AC_SUBST([make_otherdoc])
-  AC_SUBST([make_install_otherdoc])
-  AC_SUBST([make_uninstall_otherdoc])
-  AC_SUBST([make_examples])
-  AC_SUBST([make_install_examples])
-  AC_SUBST([make_uninstall_examples])])
-
-
 # We need makeinfo from Texinfo 5.0 or newer, for @codequoteundirected.
 # The minor version checking logic is present for future needs.
 
@@ -160,7 +83,6 @@ AC_DEFUN([GROFF_MAKEINFO],
   # src dir>/build-aux/missing makeinfo.  As we need a more precise
   # check of makeinfo version, we don't use it.
   [MAKEINFO=
-   if test "$docadd_info" = yes; then
      missing=
      AC_CHECK_PROG([MAKEINFO], [makeinfo], [makeinfo])
      if test -z "$MAKEINFO"; then
@@ -192,19 +114,7 @@ AC_DEFUN([GROFF_MAKEINFO],
 [Get the 'texinfo' package version 5.0 or newer.])
        fi
      fi
-
-     make_infodoc=infodoc
-     make_install_infodoc=install_infodoc
-     make_uninstall_infodoc=uninstall_infodoc
-   else
-     make_infodoc=
-     make_install_infodoc=
-     make_uninstall_infodoc=
-   fi
-   AC_SUBST([MAKEINFO])
-   AC_SUBST([make_infodoc])
-   AC_SUBST([make_install_infodoc])
-   AC_SUBST([make_uninstall_infodoc])])
+   AC_SUBST([MAKEINFO])])
 
 # 'makeinfo' and 'texi2dvi' are distributed together, so if the former
 # is too old, the latter is too.
@@ -223,9 +133,6 @@ AC_DEFUN([GROFF_HTML_PROGRAMS],
   [make_htmldoc=
    make_install_htmldoc=
    make_uninstall_htmldoc=
-   make_htmlexamples=
-   make_install_htmlexamples=
-   make_uninstall_htmlexamples=
    AC_REQUIRE([GROFF_GHOSTSCRIPT_PATH])
 
    missing=
@@ -239,16 +146,9 @@ AC_DEFUN([GROFF_HTML_PROGRAMS],
    test "$GHOSTSCRIPT" = "missing" && missing="$missing 'gs'"
 
    if test -z "$missing"; then
-     if test $docadd_html = yes; then
        make_htmldoc=htmldoc
        make_install_htmldoc=install_htmldoc
        make_uninstall_htmldoc=uninstall_htmldoc
-       if test "$docadd_examples" = yes; then
-         make_htmlexamples=html_examples
-         make_install_htmlexamples=install_htmlexamples
-         make_uninstall_htmlexamples=uninstall_htmlexamples
-       fi
-     fi
    else
      plural=`set $missing; test $[#] -gt 1 && echo s`
      missing=`set $missing
@@ -264,8 +164,7 @@ AC_DEFUN([GROFF_HTML_PROGRAMS],
         done
         echo $missing`
 
-     docnote=.
-     test $docadd_html = yes && docnote=';
+     docnote=';
   therefore, it will be possible neither to prepare, nor to install,
   groff-generated documentation in HTML format.'
 
@@ -275,14 +174,10 @@ AC_DEFUN([GROFF_HTML_PROGRAMS],
 
   Consequently, groff's HTML backend (grohtml) will not work properly$docnote
      ])
-     doc_dist_target_ok=no
    fi
    AC_SUBST([make_htmldoc])
    AC_SUBST([make_install_htmldoc])
-   AC_SUBST([make_uninstall_htmldoc])
-   AC_SUBST([make_htmlexamples])
-   AC_SUBST([make_install_htmlexamples])
-   AC_SUBST([make_uninstall_htmlexamples])])
+   AC_SUBST([make_uninstall_htmldoc])])
 
 
 # To produce PDF docs, we need both awk and ghostscript.
@@ -291,9 +186,6 @@ AC_DEFUN([GROFF_PDFDOC_PROGRAMS],
   [make_pdfdoc=
    make_install_pdfdoc=
    make_uninstall_pdfdoc=
-   make_pdfexamples=
-   make_install_pdfexamples=
-   make_uninstall_pdfexamples=
    AC_REQUIRE([GROFF_AWK_PATH])
    AC_REQUIRE([GROFF_GHOSTSCRIPT_PATH])
 
@@ -301,24 +193,16 @@ AC_DEFUN([GROFF_PDFDOC_PROGRAMS],
    test "$AWK" = missing && missing="'awk'"
    test "$GHOSTSCRIPT" = missing && missing="$missing 'gs'"
    if test -z "$missing"; then
-     if test $docadd_pdf = yes; then
        make_pdfdoc=pdfdoc
        make_install_pdfdoc=install_pdfdoc
        make_uninstall_pdfdoc=uninstall_pdfdoc
-       if test "$docadd_examples" = yes; then
-         make_pdfexamples=pdfexamples
-         make_install_pdfexamples=install_pdfexamples
-         make_uninstall_pdfexamples=uninstall_pdfexamples
-       fi
-     fi
    else
      plural=`set $missing; test $[#] -eq 2 && echo s`
      test "$plural" = s \
        && missing=`set $missing; echo "$[1] and $[2]"` \
        || missing=`echo $missing`
 
-     docnote=.
-     test $docadd_pdf = yes && docnote=';
+     docnote=';
   therefore, it will neither be possible to prepare, nor to install,
   documentation and most of the examples in PDF format.'
 
@@ -328,14 +212,10 @@ AC_DEFUN([GROFF_PDFDOC_PROGRAMS],
 
   Consequently, groff's PDF formatter (pdfroff) will not work properly$docnote
      ])
-     doc_dist_target_ok=no
    fi
    AC_SUBST([make_pdfdoc])
    AC_SUBST([make_install_pdfdoc])
-   AC_SUBST([make_uninstall_pdfdoc])
-   AC_SUBST([make_pdfexamples])
-   AC_SUBST([make_install_pdfexamples])
-   AC_SUBST([make_uninstall_pdfexamples])])
+   AC_SUBST([make_uninstall_pdfdoc])])
 
 # Option to configure path to URW fonts
 AC_DEFUN([GROFF_URW_FONTS_PATH],
@@ -1276,9 +1156,7 @@ AC_DEFUN([GROFF_INSTALL_SH],
 # Test whether install-info is available.
 
 AC_DEFUN([GROFF_INSTALL_INFO],
-  [if test $docadd_info = yes; then
-     AC_CHECK_PROGS([INSTALL_INFO], [install-info], [:])
-   fi])
+  [AC_CHECK_PROGS([INSTALL_INFO], [install-info], [:])])
 
 
 # At least one Unix system, Apple Macintosh Rhapsody 5.5,