From de0e31edcc3ab6ded038e43625b125d01c6b299d Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 4 Dec 2012 21:13:40 -0500 Subject: [PATCH] * configure.ac: Handle info/ files with or without ".info" extension. --- ChangeLog | 7 +++++-- configure.ac | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index caec4db11a..965c7882a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ +2012-12-05 Glenn Morris + + * configure.ac: Handle info/ files with or without ".info" extension. + 2012-11-24 Eli Zaretskii - * make-dist (nt): Adjust to changes in names of the *.manifest - files. + * make-dist (nt): Adjust to changes in names of the *.manifest files. 2012-11-21 Glenn Morris diff --git a/configure.ac b/configure.ac index 321cbd267f..594fe94214 100644 --- a/configure.ac +++ b/configure.ac @@ -814,7 +814,7 @@ if test "$MAKEINFO" = "no"; then MAKEINFO=makeinfo if test "x${with_makeinfo}" = "xno"; then HAVE_MAKEINFO=no - elif test ! -e $srcdir/info/emacs; then + elif test ! -e $srcdir/info/emacs && test ! -e $srcdir/info/emacs.info; then AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.7, and your source tree does not seem to have pre-built manuals in the `info' directory. Either install a suitable version of makeinfo, or re-run configure -- 2.20.1