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

Trying to build info only when 'makeinfo' is available. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4705 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2014-04-02 20:37:30 +00:00
parent 4171477fb5
commit b29ea107b6
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2014-04-02 Benno Schulenberg <bensberg@justemail.net>
* configure.ac, doc/Makefile.am: Try to build the info documentation
only when 'makeinfo' is available. Patch partly by Mike Frysinger.
2014-04-02 Mike Frysinger <vapier@gentoo.org>
* doc/man/{,fr}/Makefile.am: Simplify the man rules still further.
* .gitignore: Add 'config.cache', created by './configure -C'.

6
configure.ac
View File

@ -617,7 +617,7 @@ AS_IF([test "x$enable_libmagic" != "xno"], [
AC_CHECK_LIB(magic, magic_open)
])
# Check for groff html support
# 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
@ -631,6 +631,10 @@ else
fi
AM_CONDITIONAL(GROFF_HTML, test x$groff_html_support = xyes)
# Check for the availability of makeinfo.
AC_CHECK_PROG(haveit, makeinfo, yes, no)
AM_CONDITIONAL(HAVE_MAKEINFO, test x$haveit = xyes)
AC_CONFIG_FILES([
Makefile

10
doc/Makefile.am
View File

@ -1,7 +1,11 @@
SUBDIRS = man
if HAVE_MAKEINFO
SUBDIRS += texinfo
endif
if USE_COLOR
SUBDIRS = man syntax texinfo
else
SUBDIRS = man texinfo
SUBDIRS += syntax
endif
dist_html_DATA = faq.html