wl pushed a commit to branch master in repository groff. commit 72c9c8f857c79ee48ee4f0a3c4c00ec84758e734 Author: Werner Lemberg <w...@gnu.org> Date: Sun Oct 12 10:58:01 2014 +0200
Correctly handle `MAKEINFO' environment variable. Bug introduced in commit from 2014-03-29. * m4/groff.m4 (GROFF_MAKEINFO): Don't set MAKEINFO to empty string before actually testing it. * configure: Regenerated. --- ChangeLog | 10 ++++++++++ configure | 12 +++++++----- m4/groff.m4 | 12 +++++++----- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7272aae..bd87d09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2014-10-12 Werner LEMBERG <w...@gnu.org> + + Correctly handle `MAKEINFO' environment variable. + Bug introduced in commit from 2014-03-29. + + * m4/groff.m4 (GROFF_MAKEINFO): Don't set MAKEINFO to empty string + before actually testing it. + + * configure: Regenerated. + 2014-10-11 Bertrand Garrigues <bertrand.garrig...@laposte.net> Fix an issue on `make dist'. diff --git a/configure b/configure index 9206a51..80d843d 100755 --- a/configure +++ b/configure @@ -6056,11 +6056,7 @@ $as_echo "$as_me: WARNING: Invalid \`--with-doc' argument: $i" >&2;} -make_infodoc= - make_install_infodoc= - make_uninstall_infodoc= - MAKEINFO= - if test $docadd_info = yes; then +if test $docadd_info = yes; then missing= # Extract the first word of "makeinfo", so it can be a program name with args. set dummy makeinfo; ac_word=$2 @@ -6135,9 +6131,15 @@ Get the \`texinfo' package version 4.8 or newer if you want to convert \`groff.texinfo' into a PDF or HTML document." >&2;} fi fi + make_infodoc=infodoc make_install_infodoc=install_infodoc make_uninstall_infodoc=uninstall_infodoc + else + make_infodoc= + make_install_infodoc= + make_uninstall_infodoc= + MAKEINFO= fi diff --git a/m4/groff.m4 b/m4/groff.m4 index cbf184b..502e108 100644 --- a/m4/groff.m4 +++ b/m4/groff.m4 @@ -139,11 +139,7 @@ AC_DEFUN([GROFF_DOC_CHECK], # We need makeinfo 4.8 or newer. AC_DEFUN([GROFF_MAKEINFO], - [make_infodoc= - make_install_infodoc= - make_uninstall_infodoc= - MAKEINFO= - if test $docadd_info = yes; then + [if test $docadd_info = yes; then missing= AC_CHECK_PROG([MAKEINFO], [makeinfo], [makeinfo]) if test -z "$MAKEINFO"; then @@ -177,9 +173,15 @@ AC_DEFUN([GROFF_MAKEINFO], `groff.texinfo' into a PDF or HTML document.]) fi fi + make_infodoc=infodoc make_install_infodoc=install_infodoc make_uninstall_infodoc=uninstall_infodoc + else + make_infodoc= + make_install_infodoc= + make_uninstall_infodoc= + MAKEINFO= fi AC_SUBST([MAKEINFO]) AC_SUBST([make_infodoc]) _______________________________________________ Groff-commit mailing list Groff-commit@gnu.org https://lists.gnu.org/mailman/listinfo/groff-commit