gbranden pushed a commit to branch branden-2023-07-05 in repository groff. commit dc1e22257ebe1016fa3116b9f8f06c60ac918788 Author: G. Branden Robinson <g.branden.robin...@gmail.com> AuthorDate: Mon Apr 3 20:51:09 2023 -0500
[build]: Resume shipping pic.html. * m4/groff.m4 (GROFF_CHECK_GROHTML_PROGRAMS) (GROFF_GROHTML_PROGRAM_NOTICE, GROFF_PNMTOOLS_CAN_BE_QUIET): Rename "make_htmldoc" to "use_grohtml" as expected by "configure.ac". Also stop `AC_SUBST`ing it; we don't need "@use_grohtml@" in our Makefiles since an `AM_CONDITIONAL` in configure.ac already does an equivalent thing. Continues commit aa5787c1eb by me from 20 May. (PROCESSEDDOCFILES): Drop "$(PROCESSEDDOCFILES_HTML)" from macro definition; annotate why. Also drop stale comments from Makefile.am. --- ChangeLog | 14 ++++++++++++++ Makefile.am | 12 ------------ doc/doc.am | 6 +++++- m4/groff.m4 | 11 +++++------ 4 files changed, 24 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 00be5b7fb..db72d7a29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2023-04-03 G. Branden Robinson <g.branden.robin...@gmail.com> + + [build]: Resume shipping pic.html. + + * m4/groff.m4 (GROFF_CHECK_GROHTML_PROGRAMS) + (GROFF_GROHTML_PROGRAM_NOTICE, GROFF_PNMTOOLS_CAN_BE_QUIET): + Rename "make_htmldoc" to "use_grohtml" as expected by + "configure.ac". Also stop `AC_SUBST`ing it; we don't need + "@use_grohtml@" in our Makefiles since an `AM_CONDITIONAL` in + configure.ac already does an equivalent thing. Continues commit + aa5787c1eb by me from 20 May. + (PROCESSEDDOCFILES): Drop "$(PROCESSEDDOCFILES_HTML)" from macro + definition; annotate why. + 2023-03-13 G. Branden Robinson <g.branden.robin...@gmail.com> m4/groff.m4 (GROFF_TMAC): Eliminate garbage leading space from diff --git a/Makefile.am b/Makefile.am index c56c758da..91505b66e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -308,18 +308,6 @@ 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 can we build the HTML documentation. -# make_htmldoc -# make_install_htmldoc -# make_uninstall_htmldoc - -# 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 - # Windows `.cmd' files # make_winscripts # make_install_winscripts diff --git a/doc/doc.am b/doc/doc.am index 7b6e8f5b9..769107f81 100644 --- a/doc/doc.am +++ b/doc/doc.am @@ -74,8 +74,12 @@ PROCESSEDDOCFILES_PS = \ doc/pic.ps PROCESSEDDOCFILES_TXT = \ doc/groff-man-pages.utf8.txt +# XXX: $(PROCESSEDDOCFILES_HTML) is omitted because pic.html gets +# special handling: it needs to be placed in a subdirectory with its +# image files. If we include it here, a copy of its table of contents, +# full of broken links to each section, gets placed directly in +# $(DESTDIR)/$(docdir). PROCESSEDDOCFILES = \ - $(PROCESSEDDOCFILES_HTML) \ $(PROCESSEDDOCFILES_PS) \ $(PROCESSEDDOCFILES_PDF) \ $(PROCESSEDDOCFILES_TXT) diff --git a/m4/groff.m4 b/m4/groff.m4 index e225dd11a..3e8b38697 100644 --- a/m4/groff.m4 +++ b/m4/groff.m4 @@ -174,12 +174,12 @@ AC_DEFUN([GROFF_USE_TEX_CHECK], [ # grohtml needs the following programs to produce images from tbl(1) # tables and eqn(1) equations. -dnl Any macro that tests $make_htmldoc should AC_REQUIRE this. +dnl Any macro that tests $use_grohtml should AC_REQUIRE this. AC_DEFUN([GROFF_CHECK_GROHTML_PROGRAMS], [ AC_REQUIRE([GROFF_GHOSTSCRIPT_PATH]) - make_htmldoc=no + use_grohtml=no missing= m4_foreach([groff_prog], dnl Keep this list of programs in sync with grohtml test scripts. @@ -195,7 +195,7 @@ dnl Keep this list of programs in sync with grohtml test scripts. if test -z "$missing" then - make_htmldoc=yes + use_grohtml=yes else plural=`set $missing; test $[#] -gt 1 && echo s` oxford=`set $missing; test $[#] -gt 2 && echo ,` @@ -227,14 +227,13 @@ dnl Keep this list of programs in sync with grohtml test scripts. groff-generated documentation in HTML format. " fi - AC_SUBST([make_htmldoc]) ]) AC_DEFUN([GROFF_GROHTML_PROGRAM_NOTICE], [ AC_REQUIRE([GROFF_CHECK_GROHTML_PROGRAMS]) - if test "$make_htmldoc" = no + if test "$use_grohtml" = no then AC_MSG_NOTICE([$grohtml_notice]) fi @@ -457,7 +456,7 @@ AC_DEFUN([GROFF_PNMTOOLS_CAN_BE_QUIET], [ pnmtools_quiet= - if test "$make_htmldoc" = yes + if test "$use_grohtml" = yes then AC_MSG_CHECKING([whether PNM tools accept the '-quiet' option]) if echo P2 2 2 255 0 1 2 0 | pnmtops -quiet > /dev/null 2>&1 _______________________________________________ Groff-commit mailing list Groff-commit@gnu.org https://lists.gnu.org/mailman/listinfo/groff-commit