* Makefile.in (MAKEINFO): Use "missing" for makeinfo older than 4.0.

This commit is contained in:
Hans-Peter Nilsson 2001-11-06 07:20:20 +00:00
parent c8ab4e6d75
commit f08fa01da9
2 changed files with 9 additions and 1 deletions

View file

@ -1,3 +1,7 @@
2001-11-06 Hans-Peter Nilsson <hp@bitrange.com>
* Makefile.in (MAKEINFO): Use "missing" for makeinfo older than 4.0.
2001-10-24 Jeff Holcomb <jeffh@redhat.com> 2001-10-24 Jeff Holcomb <jeffh@redhat.com>
Makefile.in (all-bison): Don't depend on texinfo. Makefile.in (all-bison): Don't depend on texinfo.

View file

@ -141,9 +141,13 @@ M4 = `if [ -f $$r/m4/m4 ] ; \
then echo $$r/m4/m4 ; \ then echo $$r/m4/m4 ; \
else echo ${DEFAULT_M4} ; fi` else echo ${DEFAULT_M4} ; fi`
# For an installed makeinfo, we require it to be from texinfo 4 or
# higher, else we use the "missing" dummy.
MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \ MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
then echo $$r/texinfo/makeinfo/makeinfo ; \ then echo $$r/texinfo/makeinfo/makeinfo ; \
else echo makeinfo ; fi` else if (makeinfo --version \
| egrep 'texinfo[^0-9]*([1-3][0-9]|[4-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 # This just becomes part of the MAKEINFO definition passed down to
# sub-makes. It lets flags be given on the command line while still # sub-makes. It lets flags be given on the command line while still