This is the mail archive of the binutils@sources.redhat.com mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Re: [RFA:] toplevel: Don't use makeinfo older than texinfo 4



> Third attempt.  Tested by "make info" on a system with texinfo 4,
> one with no makeinfo and one with an old makeinfo in PATH.
> 
> 	* Makefile.in (MAKEINFO): Use "missing" for makeinfo older than 4.0.

Ok.  Please test it for src (binutils) also (I assume it will work,
but let's be paranoid) and feel free to apply it there also.

Patch included for the binutils folks who don't read gcc-patches...

> Index: Makefile.in
> ===================================================================
> RCS file: /cvs/gcc/egcs/Makefile.in,v
> retrieving revision 1.88
> diff -p -c -r1.88 Makefile.in
> *** Makefile.in	2001/09/29 19:36:13	1.88
> --- Makefile.in	2001/11/05 22:39:05
> *************** M4 = `if [ -f $$r/m4/m4 ] ; \
> *** 140,148 ****
>   	then echo $$r/m4/m4 ; \
>   	else echo ${DEFAULT_M4} ; fi`
> 
>   MAKEINFO = `if [ -f $$r/texinfo/makeinfo/Makefile ] ; \
>   	then echo $$r/texinfo/makeinfo/makeinfo ; \
> ! 	else echo makeinfo ; fi`
> 
>   # This just becomes part of the MAKEINFO definition passed down to
>   # sub-makes.  It lets flags be given on the command line while still
> --- 140,152 ----
>   	then echo $$r/m4/m4 ; \
>   	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 ] ; \
>   	then echo $$r/texinfo/makeinfo/makeinfo ; \
> ! 	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
>   # sub-makes.  It lets flags be given on the command line while still
> 


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]