[patch]

[cgd@broadcom.com]

At Fri, 2 May 2003 08:23:00 +0200 (CEST), Gerald Pfeifer wrote:
> Would you mind submitting an updated
> version of your patch so that the GCC Makefile/configury maintainers
> can have a look?

It's below.  And this time i've sent it to the right place.  (my
original msg wasn't going to include a patch, and i forgot to change
gcc -> gcc-patches when i added the patch.  8-)

I don't have autogen, so i just applied the same patch to makefile.in,
and tested the result w/ texinfo 4.0 to build mipsisa64-elf.  I've not
tested this w/ a 'good' version of texinfo / makeinfo.

If approved, I'd appreciate it if somebody else would apply this
(since i'd rather have them actually regenerate Makefile.in than have
me hack it.  8-)


cgd
--
2003-05-02  Chris Demetriou  <cgd@broadcom.com>

	* Makefile.tpl: Require "makeinfo" from texinfo 4.2 or later.
	* Makefile.in: Regenerate.

Index: Makefile.tpl
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.tpl,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile.tpl
--- Makefile.tpl	28 Apr 2003 02:23:46 -0000	1.44
+++ Makefile.tpl	2 May 2003 21:10:25 -0000
@@ -194,13 +194,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
+# For an installed makeinfo, we require it to be from texinfo 4.2 or
 # higher, else we use the "missing" dummy.
 MAKEINFO=@MAKEINFO@
 USUAL_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; \
+	  | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-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