From 7aec3929932054d9c13cba638a41e630c3305191 Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Sun, 15 Feb 2009 19:16:18 +0000 Subject: [PATCH] 2009-02-15 Chris Allegretta * configure.ac, doc/man/Makefile.am - Add check for HTML output support in GNU groff. Fixes Savannah bug #24461: build traps on groff. Also, add installation of html-ized man pages to $datadir/nano/man-html, since we should probably install files we went to all the trouble of generating. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4377 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 6 ++++++ configure.ac | 15 +++++++++++++++ doc/man/Makefile.am | 10 ++++++++++ 3 files changed, 31 insertions(+) diff --git a/ChangeLog b/ChangeLog index 851e52a2..ad6b2785 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-02-15 Chris Allegretta + * configure.ac, doc/man/Makefile.am - Add check for HTML output support in GNU + groff. Fixes Savannah bug #24461: build traps on groff. Also, add installation + of html-ized man pages to $datadir/nano/man-html, since we should probably + install files we went to all the trouble of generating. + 2009-02-14 Chris Allegretta * nano.c (precalc_multicolorinfo) - Add debugging so we have a better clue if further issues arise. Also start at the beginning of later lines when trying to match the diff --git a/configure.ac b/configure.ac index 6c567252..4cc40fc7 100644 --- a/configure.ac +++ b/configure.ac @@ -545,6 +545,21 @@ else fi fi +# Check for groff html support +AC_MSG_CHECKING([for HTML support in groff]) +groff -t -mandoc -Thtml /dev/null +if test $? -ne 0 ; then + echo "no" + echo "*** Will not generate HTML version of man pages ***" + echo "*** Consider installing a newer version of groff with HTML support ***" + groff_html_support=no +else + echo "yes" + groff_html_support=yes +fi +AM_CONDITIONAL(GROFF_HTML, test x$groff_html_support = xyes) + + AC_CONFIG_FILES([ Makefile doc/Makefile diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 4c6e8776..e9326745 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -6,13 +6,20 @@ endif if USE_NANORC man_MANS = nano.1 nanorc.5 rnano.1 +if GROFF_HTML BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html +endif else man_MANS = nano.1 rnano.1 +if GROFF_HTML BUILT_SOURCES = nano.1.html rnano.1.html endif +endif +if GROFF_HTML nano_man_mans = nano.1 nanorc.5 rnano.1 +htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html +htmlmandir = $(datadir)/nano/man-html nano_built_sources = nano.1.html nanorc.5.html rnano.1.html nano.1.html: nano.1 @@ -23,3 +30,6 @@ rnano.1.html: rnano.1 groff -t -mandoc -Thtml < $< > $@ EXTRA_DIST = $(nano_man_mans) $(nano_built_sources) +else +EXTRA_DIST = $(nano_man_mans) +endif -- 2.39.5