This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
Re: [patch] require makeinfo 4.2 or better
- From: cgd at broadcom dot com
- To: "Mark Mitchell" <mark at codesourcery dot com>
- Cc: drow at mvista dot com,gcc-patches at gcc dot gnu dot org,dj at redhat dot com,binutils at sources dot redhat dot com
- Date: 03 May 2003 11:10:59 -0700
- Subject: Re: [patch] require makeinfo 4.2 or better
- References: <yov5znm4df6m.fsf@broadcom.com><200305030112.h431CbA00420@greed.delorie.com><mailpost.1051924375.21845@news-sj1-1> <yov5smrwddak.fsf@broadcom.com><1051945106.3337.3.camel@minax.codesourcery.com>
At 02 May 2003 23:58:26 -0700, Mark Mitchell wrote:
> > Mark? How about this for the gcc 3.3 branch? (And, now, or after
> > 3.3? 8-)
>
> This is OK for 3.3; check it in ASAP.
OK. The exact patch didn't apply (looks like USUAL_MAKEINFO, etc.,
was added on the trunk), but the merge was trivial. 8-)
Below is exactly what was applied.
cgd
--
2003-05-03 Chris Demetriou <cgd@broadcom.com>
Merge from mainline:
2003-05-02 Chris Demetriou <cgd@broadcom.com>
* Makefile.tpl: Require "makeinfo" from texinfo 4.2 or later.
* Makefile.in: Regenerate.
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.in,v
retrieving revision 1.129.2.7
diff -u -p -r1.129.2.7 Makefile.in
--- Makefile.in 29 Apr 2003 15:03:59 -0000 1.129.2.7
+++ Makefile.in 3 May 2003 18:07:48 -0000
@@ -151,12 +151,12 @@ 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 = `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
Index: Makefile.tpl
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.tpl,v
retrieving revision 1.13.6.6
diff -u -p -r1.13.6.6 Makefile.tpl
--- Makefile.tpl 29 Apr 2003 15:03:59 -0000 1.13.6.6
+++ Makefile.tpl 3 May 2003 18:07:48 -0000
@@ -154,12 +154,12 @@ 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 = `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