From 37e8e528aa2e201424a9a13f8541f1503031f66f Mon Sep 17 00:00:00 2001 From: Chris Demetriou Date: Sat, 3 May 2003 01:31:50 +0000 Subject: [PATCH] 2003-05-02 Chris Demetriou * Makefile.tpl: Require "makeinfo" from texinfo 4.2 or later. * Makefile.in: Regenerate. --- ChangeLog | 5 +++++ Makefile.in | 4 ++-- Makefile.tpl | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 657d15fcd..b3c433922 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-04-27 Daniel Jacobowitz * src-release (DEVO_SUPPORT): Add src-release, Makefile.tpl, diff --git a/Makefile.in b/Makefile.in index 754329ea2..3f3ea9a02 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 018f18f5d..b634b357e 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