Ups, hello, Ingo Schwarze <schwa...@usta.de> wrote: |Peter Schaffter wrote on Fri, Sep 26, 2014 at 08:26:45PM -0400: |> On Fri, Sep 19, 2014, Ingo Schwarze wrote: | |>> Given that the build systems disables building HTML documentation |>> when some support software is missing on the target system and |>> that the main mom documentation is (very unfortunately, but that's |>> the current state of affairs) HTML, we end up in a situation where |>> some groff installations do not include full mom documentation.
|Thank your for your patch. It definitely got me going. | |I don't think it is quite ideal, though, since with your patch, the attached patch instead adds new (un)?install_shipped_htmldoc targets which hopefully works that out the right way! Does it miss something more on HEAD, as i don't think so? Sorry for not spending a thought on this (and tuning in this issue earlier, ooops..). (Maybe because i dislike HTML documentation? Oh what an insolent ashole am i.. when thinking about it :)?) Btw., Werner, in my environment AC_CHECK_PROG() checks even if MAKEINFO= is set to the empty value beforehand! |While replacing "$(make_install_examples)" with "install_examples" |seems useful to get mom-pdf.pdf installed - which is documentation, |not an example - i'm not sure making this unconditional in possible. It is listed under PROCESSEDEXAMPLEFILES which is why i didn't look any further back then if i recall correctly. |It seems a bit unfortunate how the build system is conflating |aspects together. The --with-doc option is intended to say |"the admin wants documentation in that output format". |Whether the tools are available to convert files to those |formats is a completely different question. The proper |logic would be: Of course more *_shipped_* can be added if i would have missed anything. --steffen
diff --git a/Makefile.in b/Makefile.in index 4dd82ef..54758a2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -282,6 +282,10 @@ make_htmlexamples=@make_htmlexamples@ make_install_htmlexamples=@make_install_htmlexamples@ make_uninstall_htmlexamples=@make_uninstall_htmlexamples@ +# However, there may always be some prebuild HTML documentation +make_install_shipped_htmldoc=@make_install_shipped_htmldoc@ +make_uninstall_shipped_htmldoc=@make_uninstall_shipped_htmldoc@ + # The configure script also checks whether all necessary utility programs # for pdfroff are available -- only then we can build PDF documentation. make_pdfdoc=@make_pdfdoc@ diff --git a/contrib/mom/Makefile.sub b/contrib/mom/Makefile.sub index 04fc501..683abe6 100644 --- a/contrib/mom/Makefile.sub +++ b/contrib/mom/Makefile.sub @@ -134,7 +134,7 @@ examples/stamp: touch $@ install_data: install_always \ - $(make_install_pdfdoc) $(make_install_htmldoc) \ + $(make_install_pdfdoc) $(make_install_shipped_htmldoc) \ $(make_install_examples) install_always: stamp-strip $(NORMALFILES) @@ -151,7 +151,7 @@ install_always: stamp-strip $(NORMALFILES) install_pdfdoc: # Since this uses examples/, it's in install_pdfexamples -install_htmldoc: install_always $(HTMLDOCFILES) +install_shipped_htmldoc: install_always $(HTMLDOCFILES) -test -d $(DESTDIR)$(htmldocdir)/mom \ || $(mkinstalldirs) $(DESTDIR)$(htmldocdir)/mom for f in $(HTMLDOCFILES_); do \ @@ -192,7 +192,7 @@ stamp-strip: $(STRIPFILES) touch $@ uninstall_sub: uninstall_always \ - $(make_uninstall_pdfdoc) $(make_uninstall_htmldoc) \ + $(make_uninstall_pdfdoc) $(make_uninstall_shipped_htmldoc) \ $(make_uninstall_examples) uninstall_always: @@ -203,7 +203,7 @@ uninstall_always: uninstall_pdfdoc: uninstall_always # Since that used examples/, it's in uninstall_pdfexamples -uninstall_htmldoc: uninstall_always +uninstall_shipped_htmldoc: uninstall_always -for f in $(HTMLDOCFILES_); do \ $(RM) $(DESTDIR)$(htmldocdir)/mom/$$f; \ done diff --git a/m4/groff.m4 b/m4/groff.m4 index 502e108..10b93d8 100644 --- a/m4/groff.m4 +++ b/m4/groff.m4 @@ -109,6 +109,13 @@ AC_DEFUN([GROFF_DOC_CHECK], 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 @@ -128,6 +135,8 @@ AC_DEFUN([GROFF_DOC_CHECK], 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])