ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2009-02-15 Chris Allegretta <chrisa@asty.org> 

* 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
master
Chris Allegretta 2009-02-15 19:16:18 +00:00
parent e027fc2edd
commit 7aec392993
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2009-02-15 Chris Allegretta <chrisa@asty.org>
* 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 <chrisa@asty.org> 2009-02-14 Chris Allegretta <chrisa@asty.org>
* nano.c (precalc_multicolorinfo) - Add debugging so we have a better clue if further * 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 issues arise. Also start at the beginning of later lines when trying to match the

15
configure.ac
View File

@ -545,6 +545,21 @@ else
fi fi
fi fi
# Check for groff html support
AC_MSG_CHECKING([for HTML support in groff])
groff -t -mandoc -Thtml </dev/null >/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([ AC_CONFIG_FILES([
Makefile Makefile
doc/Makefile doc/Makefile

10
doc/man/Makefile.am
View File

@ -6,13 +6,20 @@ endif
if USE_NANORC if USE_NANORC
man_MANS = nano.1 nanorc.5 rnano.1 man_MANS = nano.1 nanorc.5 rnano.1
if GROFF_HTML
BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html
endif
else else
man_MANS = nano.1 rnano.1 man_MANS = nano.1 rnano.1
if GROFF_HTML
BUILT_SOURCES = nano.1.html rnano.1.html BUILT_SOURCES = nano.1.html rnano.1.html
endif endif
endif
if GROFF_HTML
nano_man_mans = nano.1 nanorc.5 rnano.1 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_built_sources = nano.1.html nanorc.5.html rnano.1.html
nano.1.html: nano.1 nano.1.html: nano.1
@ -23,3 +30,6 @@ rnano.1.html: rnano.1
groff -t -mandoc -Thtml < $< > $@ groff -t -mandoc -Thtml < $< > $@
EXTRA_DIST = $(nano_man_mans) $(nano_built_sources) EXTRA_DIST = $(nano_man_mans) $(nano_built_sources)
else
EXTRA_DIST = $(nano_man_mans)
endif