From d8b01fbed416cb58f5782aa2a9d2548870a55e74 Mon Sep 17 00:00:00 2001 From: cgd Date: Sat, 3 May 2003 01:29:54 +0000 Subject: [PATCH] 2003-05-02 Chris Demetriou * Makefile.tpl: Require "makeinfo" from texinfo 4.2 or later. * Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@66415 138bc75d-0d04-0410-961f-82ee72b054a4 --- ChangeLog | 5 +++++ Makefile.in | 4 ++-- Makefile.tpl | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19fad45c6d8..9f2de2f9905 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-05-02 Chris Demetriou + + * Makefile.tpl: Require "makeinfo" from texinfo 4.2 or later. + * Makefile.in: Regenerate. + 2003-05-02 Wolfgang Bangerth * MAINTAINERS (GNATS only): Add Falk Hueffner. diff --git a/Makefile.in b/Makefile.in index 754329ea2cf..3f3ea9a0261 100644 --- a/Makefile.in +++ b/Makefile.in @@ -191,13 +191,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 diff --git a/Makefile.tpl b/Makefile.tpl index 018f18f5db4..b634b357e46 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -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 -- 2.11.0