diff options
| author | cgd <cgd@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-05-03 01:29:54 +0000 |
|---|---|---|
| committer | cgd <cgd@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-05-03 01:29:54 +0000 |
| commit | d8b01fbed416cb58f5782aa2a9d2548870a55e74 (patch) | |
| tree | ebb3cacf789b79ca3750ec7a90a5a985509e3e4f /Makefile.tpl | |
| parent | 467e3ec9bafb676c5eeda6d2c2af1613b0e18616 (diff) | |
2003-05-02 Chris Demetriou <cgd@broadcom.com>
* 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
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 4 |
1 files changed, 2 insertions, 2 deletions
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 |