diff --git a/ChangeLog b/ChangeLog
index 1b1fea40293..9de6dc7939c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-23  Alexandre Oliva  <aoliva@redhat.com>
+
+	* Makefile.in (MAKEINFO): Don't assume makeinfo will be built just
+	because its Makefile is there; test for the executable instead.
+
 2002-02-22  Alexandre Oliva  <aoliva@redhat.com>
 
 	* configure.in (CXX_FOR_TARGET): Add -shared-libgcc for
diff --git a/Makefile.in b/Makefile.in
index 4e865c8e6fd..d8c5c59f84f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -142,7 +142,7 @@ M4 = `if [ -f $$r/m4/m4 ] ; \
 
 # For an installed makeinfo, we require it to be from texinfo 4 or
 # higher, else we use the "missing" dummy.
-MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
+MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
 	then echo $$r/texinfo/makeinfo/makeinfo ; \
 	else if (makeinfo --version \
 	  | egrep 'texinfo[^0-9]*([1-3][0-9]|[4-9])') >/dev/null 2>&1; \