From: Hans-Peter Nilsson <hp@axis.com>
Date: Tue, 6 Nov 2001 07:20:20 +0000 (+0000)
Subject: 	* Makefile.in (MAKEINFO): Use "missing" for makeinfo older than 4.0.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f08fa01da9c9b89d2a338c2d14f5715f772ad592;p=binutils-gdb.git

	* Makefile.in (MAKEINFO): Use "missing" for makeinfo older than 4.0.
---

diff --git a/ChangeLog b/ChangeLog
index c7b61dd5084..d9c69e20b72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-06  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* Makefile.in (MAKEINFO): Use "missing" for makeinfo older than 4.0.
+
 2001-10-24  Jeff Holcomb  <jeffh@redhat.com>
 
 	Makefile.in (all-bison): Don't depend on texinfo.
diff --git a/Makefile.in b/Makefile.in
index 0cfeb53dc09..2b713fa5787 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -141,9 +141,13 @@ M4 = `if [ -f $$r/m4/m4 ] ; \
 	then echo $$r/m4/m4 ; \
 	else echo ${DEFAULT_M4} ; fi`
 
+# 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 ] ; \
 	then echo $$r/texinfo/makeinfo/makeinfo ; \
-	else echo makeinfo ; fi`
+	else if (makeinfo --version \
+	  | egrep 'texinfo[^0-9]*([1-3][0-9]|[4-9])') >/dev/null 2>&1; \
+        then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
 
 # This just becomes part of the MAKEINFO definition passed down to
 # sub-makes.  It lets flags be given on the command line while still