JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* Makefile.tpl: Require "makeinfo" from texinfo 4.2 or later.
        * Makefile.in: Regenerate.
This commit is contained in:
Chris Demetriou
2003-05-03 01:31:50 +00:00
parent c854ba881a
commit 37e8e528aa
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -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> 2003-04-27 Daniel Jacobowitz <drow@mvista.com>
* src-release (DEVO_SUPPORT): Add src-release, Makefile.tpl, * src-release (DEVO_SUPPORT): Add src-release, Makefile.tpl,

4
Makefile.in
View File

@@ -191,13 +191,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 # For an installed makeinfo, we require it to be from texinfo 4.2 or
# higher, else we use the "missing" dummy. # higher, else we use the "missing" dummy.
MAKEINFO=@MAKEINFO@ MAKEINFO=@MAKEINFO@
USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \ USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
then echo $$r/texinfo/makeinfo/makeinfo ; \ then echo $$r/texinfo/makeinfo/makeinfo ; \
else if (makeinfo --version \ 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` 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

4
Makefile.tpl
View File

@@ -194,13 +194,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 # For an installed makeinfo, we require it to be from texinfo 4.2 or
# higher, else we use the "missing" dummy. # higher, else we use the "missing" dummy.
MAKEINFO=@MAKEINFO@ MAKEINFO=@MAKEINFO@
USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \ USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
then echo $$r/texinfo/makeinfo/makeinfo ; \ then echo $$r/texinfo/makeinfo/makeinfo ; \
else if (makeinfo --version \ 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` 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