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

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

diff --git a/ChangeLog b/ChangeLog
index 657d15fcddf7b8d7ef4d95d0c352b777b036ec76..b3c433922cfa6c9658e441eac8c16e39cd093eac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-02  Chris Demetriou  <cgd@broadcom.com>
+
+        * Makefile.tpl: Require "makeinfo" from texinfo 4.2 or later.
+        * Makefile.in: Regenerate.
+
 2003-04-27  Daniel Jacobowitz  <drow@mvista.com>
 
        * src-release (DEVO_SUPPORT): Add src-release, Makefile.tpl,

diff --git a/Makefile.in b/Makefile.in
index 754329ea2cf9223f9b8a1bca7e989804f1ae6c67..3f3ea9a0261fd344322e3ac80c5302fe2b7ffc50 100644 (file)
--- 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 018f18f5db4ec7f5bf88d41d23f55163b6a6fcd3..b634b357e465f55795234fdbcfdf14a46270af82 100644 (file)
--- 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